Skip to content

Commit

Permalink
Auto merge of #44143 - alexcrichton:faster-bootstrap, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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 #44132
  • Loading branch information
bors committed Aug 30, 2017
2 parents 09ea6b7 + 1d70b66 commit c2f9cc4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions src/bootstrap/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c2f9cc4

Please sign in to comment.