diff options
| author | Ralf Jung <post@ralfj.de> | 2025-01-08 08:52:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-08 08:52:24 +0000 |
| commit | 8edcd9374a26cffa9474ce92d79c64892caef146 (patch) | |
| tree | 36b4829675d832d323283fc37457f6509f8a519c /compiler/rustc_codegen_ssa/src/back | |
| parent | 16a26f9b4658c3481d231241a6c6130edc9a6de7 (diff) | |
| parent | 2d180714e14b34e36bf883bdf706ebaf5fa96754 (diff) | |
| download | rust-8edcd9374a26cffa9474ce92d79c64892caef146.tar.gz rust-8edcd9374a26cffa9474ce92d79c64892caef146.zip | |
Merge pull request #4127 from rust-lang/rustup-2025-01-08
Automatic Rustup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/back')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 2587d6dfdc4..e4b3ad19801 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -2451,10 +2451,12 @@ fn add_order_independent_options( } if sess.target.os == "emscripten" { - cmd.cc_arg("-s").cc_arg(if sess.panic_strategy() == PanicStrategy::Abort { - "DISABLE_EXCEPTION_CATCHING=1" + cmd.cc_arg(if sess.panic_strategy() == PanicStrategy::Abort { + "-sDISABLE_EXCEPTION_CATCHING=1" + } else if sess.opts.unstable_opts.emscripten_wasm_eh { + "-fwasm-exceptions" } else { - "DISABLE_EXCEPTION_CATCHING=0" + "-sDISABLE_EXCEPTION_CATCHING=0" }); } |