about summary refs log tree commit diff
path: root/library/panic_unwind/src
diff options
context:
space:
mode:
authorNoa <coolreader18@gmail.com>2024-02-22 16:52:48 -0600
committerNoa <coolreader18@gmail.com>2024-02-22 16:52:48 -0600
commit658a0a20eac4341e31c57cf08e019b53f09b93b4 (patch)
tree418e476370232497272af15ac0e3575fbd6d1e5e /library/panic_unwind/src
parent861c7e74c8bbc49082dcd38ef7169d99c69cd104 (diff)
downloadrust-658a0a20eac4341e31c57cf08e019b53f09b93b4.tar.gz
rust-658a0a20eac4341e31c57cf08e019b53f09b93b4.zip
Unconditionally pass -wasm-enable-eh
Diffstat (limited to 'library/panic_unwind/src')
-rw-r--r--library/panic_unwind/src/lib.rs7
1 files changed, 1 insertions, 6 deletions
diff --git a/library/panic_unwind/src/lib.rs b/library/panic_unwind/src/lib.rs
index bc3c9363d8a..37e1d2cf6d1 100644
--- a/library/panic_unwind/src/lib.rs
+++ b/library/panic_unwind/src/lib.rs
@@ -60,12 +60,7 @@ cfg_if::cfg_if! {
     ))] {
         #[path = "gcc.rs"]
         mod real_imp;
-    } else if #[cfg(all(target_family = "wasm", panic = "unwind"))] {
-        // for now, PanicStrategy::Unwind is not the default for wasm targets,
-        // so we need the panic = "unwind" in the cfg above. to use llvm.wasm.throw,
-        // we need to pass -wasm-enable-eh to LLVM, but that only happens if rustc
-        // is compiling with -C panic=unwind. So, this lets us -Zbuild-std with
-        // panic=unwind, while keeping the default panic=abort working.
+    } else if #[cfg(target_family = "wasm")] {
         #[path = "wasm.rs"]
         mod real_imp;
     } else {