diff options
| author | bors <bors@rust-lang.org> | 2017-11-11 02:11:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-11 02:11:34 +0000 |
| commit | c703ff275fd84bd44b6618a8a59e102fee94e635 (patch) | |
| tree | 00de58b18af341a38e44b3022e6aeae8f289a8d1 /src/bootstrap | |
| parent | 25cc4a86c0913dac206f17818dd44b63cb8e53d6 (diff) | |
| parent | ef0d843e6186d189a3b8780ee6daa2eb5c42d2fd (diff) | |
| download | rust-c703ff275fd84bd44b6618a8a59e102fee94e635.tar.gz rust-c703ff275fd84bd44b6618a8a59e102fee94e635.zip | |
Auto merge of #45806 - alexcrichton:update-llvm-for-mips, r=michaelwoerister
rustbuild: Re-enable ThinLTO for MIPS Now that the upstream LLVM bug is now fixed this commit cherry-picks the commit onto our LLVM and then re-enables the ThinLTO paths for MIPS. Closes #45654
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/builder.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index bb3d9dc3f33..c8e808a0188 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -625,8 +625,7 @@ impl<'a> Builder<'a> { if mode != Mode::Libstd && // FIXME(#45320) self.config.rust_codegen_units.is_none() && - self.build.is_rust_llvm(compiler.host) && - !target.contains("mips") // FIXME(#45654) + self.build.is_rust_llvm(compiler.host) { cargo.env("RUSTC_THINLTO", "1"); } |
