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
This commit is contained in:
bors 2017-11-11 02:11:34 +00:00
commit c703ff275f
2 changed files with 2 additions and 3 deletions

View file

@ -625,8 +625,7 @@ impl<'a> Builder<'a> {
if mode != Mode::Libstd && // FIXME(#45320) if mode != Mode::Libstd && // FIXME(#45320)
self.config.rust_codegen_units.is_none() && self.config.rust_codegen_units.is_none() &&
self.build.is_rust_llvm(compiler.host) && self.build.is_rust_llvm(compiler.host)
!target.contains("mips") // FIXME(#45654)
{ {
cargo.env("RUSTC_THINLTO", "1"); cargo.env("RUSTC_THINLTO", "1");
} }

@ -1 +1 @@
Subproject commit 83b72cedfd7800ffc983d2855a85c5d06a545aa7 Subproject commit 86c7a9985d0855255927d8653ea4d4407de8cc90