diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2025-01-20 14:12:41 +0100 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2025-01-20 14:12:41 +0100 |
| commit | 1e0204beae7c0ebc5cddc64d1375bc7ee95f41db (patch) | |
| tree | 35fe35cfae96730b99e09b4dd97fdff8ab3e3a64 /compiler/rustc_codegen_ssa/src/back | |
| parent | 808bd955862a48f604f1b227c7ca0bbb7ae2a8e8 (diff) | |
| parent | ecda83b30f0f68cf5692855dddc0bc38ee8863fc (diff) | |
| download | rust-1e0204beae7c0ebc5cddc64d1375bc7ee95f41db.tar.gz rust-1e0204beae7c0ebc5cddc64d1375bc7ee95f41db.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/back')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index e4b3ad19801..df35b5e8426 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -2451,10 +2451,10 @@ fn add_order_independent_options( } if sess.target.os == "emscripten" { - cmd.cc_arg(if sess.panic_strategy() == PanicStrategy::Abort { - "-sDISABLE_EXCEPTION_CATCHING=1" - } else if sess.opts.unstable_opts.emscripten_wasm_eh { + cmd.cc_arg(if sess.opts.unstable_opts.emscripten_wasm_eh { "-fwasm-exceptions" + } else if sess.panic_strategy() == PanicStrategy::Abort { + "-sDISABLE_EXCEPTION_CATCHING=1" } else { "-sDISABLE_EXCEPTION_CATCHING=0" }); |