]> git.lizzy.rs Git - rust.git/commitdiff
wasm32-unknown-emscripten expects the rust_eh_personality symbol
authorChristopher Serr <christopher.serr@gmail.com>
Thu, 8 Nov 2018 01:56:25 +0000 (02:56 +0100)
committerChristopher Serr <christopher.serr@gmail.com>
Thu, 8 Nov 2018 02:27:45 +0000 (03:27 +0100)
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 #55276

src/libpanic_abort/lib.rs

index b86928534cb244f79ccc09202963576208bf17fc..9235f8e7660a1112609a86e1f4ea85b237b15a08 100644 (file)
@@ -97,7 +97,10 @@ unsafe fn abort() -> ! {
 pub mod personalities {
     #[no_mangle]
     #[cfg(not(any(
-        target_arch = "wasm32",
+        all(
+            target_arch = "wasm32",
+            not(target_os = "emscripten"),
+        ),
         all(
             target_os = "windows",
             target_env = "gnu",