about summary refs log tree commit diff
path: root/src/bootstrap/lib.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-08-30 02:56:48 +0000
committerbors <bors@rust-lang.org>2017-08-30 02:56:48 +0000
commitc2f9cc4a3bf8917e6cd9f31e3a2e9baa8c15e8f1 (patch)
tree3de1314b8513f11faf697096c92e5906d56f3b75 /src/bootstrap/lib.rs
parent09ea6b7a82d16e490ad98faed0f746cf19589108 (diff)
parent1d70b66fe49660006f35a699ef5733e97c0786f0 (diff)
downloadrust-c2f9cc4a3bf8917e6cd9f31e3a2e9baa8c15e8f1.tar.gz
rust-c2f9cc4a3bf8917e6cd9f31e3a2e9baa8c15e8f1.zip
Auto merge of #44143 - alexcrichton:faster-bootstrap, r=Mark-Simulacrum
rustbuild: Avoid some extraneous rustc compiles on cross builds

This tweaks a few locations here and there to avoid compiling rustc too many times on our cross-builders on CI.

Closes https://github.com/rust-lang/rust/issues/44132
Diffstat (limited to 'src/bootstrap/lib.rs')
-rw-r--r--src/bootstrap/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 84a9e56b644..f21b382619d 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -717,7 +717,7 @@ impl Build {
     fn force_use_stage1(&self, compiler: Compiler, target: Interned<String>) -> bool {
         !self.config.full_bootstrap &&
             compiler.stage >= 2 &&
-            self.hosts.iter().any(|h| *h == target)
+            (self.hosts.iter().any(|h| *h == target) || target == self.build)
     }
 
     /// Returns the directory that OpenSSL artifacts are compiled into if