diff options
| author | bors <bors@rust-lang.org> | 2018-11-10 01:16:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-10 01:16:02 +0000 |
| commit | 06118eac4c602a22d2004c98756a95f2c5ec95d5 (patch) | |
| tree | 4039e739f4710fbe8a4aab96b21bfd1cc46a0daa /src/bootstrap | |
| parent | 36a50c29f6c5c386fba6ab685818755ac55152e5 (diff) | |
| parent | 82574e9ec804b6efbf6dfcf523d32618528ee32b (diff) | |
| download | rust-06118eac4c602a22d2004c98756a95f2c5ec95d5.tar.gz rust-06118eac4c602a22d2004c98756a95f2c5ec95d5.zip | |
Auto merge of #55626 - nikic:update-emscripten, r=alexcrichton
Update emscripten This updates emscripten to 1.38.15, which is based on LLVM 6.0.1 and would allow us to drop code for handling LLVM 4. The main issue I ran into is that exporting statics through `EXPORTED_FUNCTIONS` no longer works. As far as I understand exporting non-functions doesn't really make sense under emscripten anyway, so I've modified the symbol export code to not even try. Closes #52323.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/compile.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 885ad07e087..cef0849937b 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -736,7 +736,7 @@ pub fn build_codegen_backend(builder: &Builder, // Pass down configuration from the LLVM build into the build of // librustc_llvm and librustc_codegen_llvm. - if builder.is_rust_llvm(target) { + if builder.is_rust_llvm(target) && backend != "emscripten" { cargo.env("LLVM_RUSTLLVM", "1"); } cargo.env("LLVM_CONFIG", &llvm_config); |
