diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-02 15:17:39 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-04 18:50:57 +0100 |
| commit | 9eb19273a3ad514529cbb80f22e198e01de18a82 (patch) | |
| tree | 9a12db483f20cee5cf14ce5f64672a58943d8be4 /src/bootstrap/compile.rs | |
| parent | ac708826b0d97e105f91a4cde41bfe14cff032f2 (diff) | |
| download | rust-9eb19273a3ad514529cbb80f22e198e01de18a82.tar.gz rust-9eb19273a3ad514529cbb80f22e198e01de18a82.zip | |
Update llvm-emscripten
This updates emscripten to version 1.38.15, which is based on LLVM 6.0.1.
Diffstat (limited to 'src/bootstrap/compile.rs')
| -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); |