diff options
| author | bors <bors@rust-lang.org> | 2017-08-30 02:56:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-30 02:56:48 +0000 |
| commit | c2f9cc4a3bf8917e6cd9f31e3a2e9baa8c15e8f1 (patch) | |
| tree | 3de1314b8513f11faf697096c92e5906d56f3b75 | |
| parent | 09ea6b7a82d16e490ad98faed0f746cf19589108 (diff) | |
| parent | 1d70b66fe49660006f35a699ef5733e97c0786f0 (diff) | |
| download | rust-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
| -rw-r--r-- | src/bootstrap/doc.rs | 5 | ||||
| -rw-r--r-- | src/bootstrap/lib.rs | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index 86f5346bea1..b9a52a66793 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -669,11 +669,6 @@ impl Step for ErrorIndex { let build = builder.build; let target = self.target; - builder.ensure(compile::Rustc { - compiler: builder.compiler(0, build.build), - target, - }); - println!("Documenting error index ({})", target); let out = build.doc_out(target); t!(fs::create_dir_all(&out)); 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 |