Skip to content

Commit 6b593d1

Browse files
authored
Rollup merge of rust-lang#55774 - CryZe:patch-5, r=alexcrichton
wasm32-unknown-emscripten expects the rust_eh_personality symbol The `wasm32-unknown-emscripten` expects the `rust_eh_personality` symbol to be there, but a cfg checking for `target_arch = "wasm32"` which was meant to remove the symbol from the `wasm32-unknown-unknown` target, didn't check for whether `emscripten` is targeted or not, so the symbol accidentally got filtered out there as well. Fixes rust-lang#55276
2 parents eb5e607 + a9b5988 commit 6b593d1

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/libpanic_abort/lib.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,10 @@ pub unsafe extern fn __rust_start_panic(_payload: usize) -> u32 {
9797
pub mod personalities {
9898
#[no_mangle]
9999
#[cfg(not(any(
100-
target_arch = "wasm32",
100+
all(
101+
target_arch = "wasm32",
102+
not(target_os = "emscripten"),
103+
),
101104
all(
102105
target_os = "windows",
103106
target_env = "gnu",

0 commit comments

Comments
 (0)