diff options
| author | Jan-Erik Rediger <janerik@fnordig.de> | 2018-06-28 12:24:14 +0200 |
|---|---|---|
| committer | Jan-Erik Rediger <janerik@fnordig.de> | 2018-06-28 15:02:38 +0200 |
| commit | 8983ff522691249f1c38e36cb56c6b9a9e5348b1 (patch) | |
| tree | 8d4eb5df6486c525d3a05fc1de4a1560a4e119c4 | |
| parent | ba196bdcb10736da5d14c961bd8962d80e300913 (diff) | |
| download | rust-8983ff522691249f1c38e36cb56c6b9a9e5348b1.tar.gz rust-8983ff522691249f1c38e36cb56c6b9a9e5348b1.zip | |
Explicitely disable WASM code generation for Emscripten
Emscripten changed the default behavior recently: https://github.com/kripken/emscripten/blob/bd050e64bb0d9952df1344b8ea9356252328ad83/ChangeLog.markdown#v1381-05172018 It now defaults to WebAssembly and requires an explicit flag to generate asm.js. WASM=0 is also valid for older emcc and thus doesn't break it. Closes #51856
| -rw-r--r-- | src/librustc_target/spec/asmjs_unknown_emscripten.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustc_target/spec/asmjs_unknown_emscripten.rs b/src/librustc_target/spec/asmjs_unknown_emscripten.rs index e2cf714f0ea..4e716fb207f 100644 --- a/src/librustc_target/spec/asmjs_unknown_emscripten.rs +++ b/src/librustc_target/spec/asmjs_unknown_emscripten.rs @@ -16,7 +16,9 @@ pub fn target() -> Result<Target, String> { vec!["-s".to_string(), "ERROR_ON_UNDEFINED_SYMBOLS=1".to_string(), "-s".to_string(), - "ABORTING_MALLOC=0".to_string()]); + "ABORTING_MALLOC=0".to_string(), + "-s".to_string(), + "WASM=0".to_string()]); let opts = TargetOptions { dynamic_linking: false, |