aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz93@gmail.com>2024-05-15 21:41:19 -0400
committerEli Schwartz <eschwartz93@gmail.com>2024-05-15 21:41:19 -0400
commit7d28ff29396f9d7043204de8ddc52226b9903811 (patch)
treea7b4ebf7874cd2d5e26efa04cbe90e940c1cf3ac
parentf24307e55943f08e1a505a24112ee62d127c0900 (diff)
downloadmeson-7d28ff29396f9d7043204de8ddc52226b9903811.zip
meson-7d28ff29396f9d7043204de8ddc52226b9903811.tar.gz
meson-7d28ff29396f9d7043204de8ddc52226b9903811.tar.bz2
docs: fix description of cpp_eh=none
We changed the behavior in #6116 but did not change the docs as well. Fixes #8233
-rw-r--r--docs/markdown/Builtin-options.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/markdown/Builtin-options.md b/docs/markdown/Builtin-options.md
index 64d16ab..b4039d6 100644
--- a/docs/markdown/Builtin-options.md
+++ b/docs/markdown/Builtin-options.md
@@ -280,11 +280,11 @@ All these `<lang>_*` options are specified per machine. See below in
the [specifying options per machine](#specifying-options-per-machine)
section on how to do this in cross builds.
-When using MSVC, `cpp_eh=none` will result in no exception flags being
-passed, while the `cpp_eh=[value]` will result in `/EH[value]`. Since
-*0.51.0* `cpp_eh=default` will result in `/EHsc` on MSVC. When using
-gcc-style compilers, nothing is passed (allowing exceptions to work),
-while `cpp_eh=none` passes `-fno-exceptions`.
+When using MSVC, `cpp_eh=[value]` will result in `/EH[value]` being passed.
+The magic value `none` translates to `s-c-` to disable exceptions. *Since
+0.51.0* `default` translates to `sc`. When using gcc-style compilers, nothing
+is passed (allowing exceptions to work), while `cpp_eh=none` passes
+`-fno-exceptions`.
Since *0.54.0* The `<lang>_thread_count` option can be used to control
the value passed to `-s PTHREAD_POOL_SIZE` when using emcc. No other