diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-04-14 17:41:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-14 17:41:06 -0400 |
| commit | 13dc855cc334ce4104e05dc239b0bf8b402609ce (patch) | |
| tree | 775227a3882529ea31812df3f43b325060e0321a /src | |
| parent | 5aa96024e3679f67925495f5322d6d65c3192fa1 (diff) | |
| parent | ec27aa97b921957711b96e578c7c197ff28553ac (diff) | |
| download | rust-13dc855cc334ce4104e05dc239b0bf8b402609ce.tar.gz rust-13dc855cc334ce4104e05dc239b0bf8b402609ce.zip | |
Rollup merge of #41303 - CryZe:patch-5, r=japaric
Compile WASM as WASM instead of asm.js Looks like the LinkerFlavor change introduced in #40018 accidentally uses GCC for the WebAssembly target, causing Rust to never actually pass the post link args to emscripten. This then causes the code to be compiled as asm.js instead of WebAssembly, because the Binaryen tools never run due to the missing linker argument.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_back/target/wasm32_unknown_emscripten.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_back/target/wasm32_unknown_emscripten.rs b/src/librustc_back/target/wasm32_unknown_emscripten.rs index a51f59d6ff1..f5fb63038e9 100644 --- a/src/librustc_back/target/wasm32_unknown_emscripten.rs +++ b/src/librustc_back/target/wasm32_unknown_emscripten.rs @@ -14,7 +14,7 @@ use super::emscripten_base::{cmd}; pub fn target() -> Result<Target, String> { let mut post_link_args = LinkArgs::new(); - post_link_args.insert(LinkerFlavor::Gcc, + post_link_args.insert(LinkerFlavor::Em, vec!["-s".to_string(), "BINARYEN=1".to_string(), "-s".to_string(), |