rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use stage 1 compiler only for stamps

Browse Source
This commit is contained in:
Collins Abitekaniza
2018-07-06 22:56:13 +03:00
committed by Mark Rousskov
parent c0af0b0213
commit c22c7098ca
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bootstrap/builder.rs
View File

@@ -721,29 +721,29 @@ impl<'a> Builder<'a> {
// This is for the original compiler, but if we're forced to use stage 1, then // This is for the original compiler, but if we're forced to use stage 1, then
// std/test/rustc stamps won't exist in stage 2, so we need to get those from stage 1, since // std/test/rustc stamps won't exist in stage 2, so we need to get those from stage 1, since
// we copy the libs forward. // we copy the libs forward.
let compiler = if self.force_use_stage1(compiler, target) { let cmp = if self.force_use_stage1(compiler, target) {
self.compiler(1, compiler.host) self.compiler(1, compiler.host)
} else { } else {
compiler compiler
}; };
let libstd_stamp = match cmd { let libstd_stamp = match cmd {
"check" => check::libstd_stamp(self, compiler, target), "check" => check::libstd_stamp(self, cmp, target),
_ => compile::libstd_stamp(self, compiler, target), _ => compile::libstd_stamp(self, cmp, target),
}; };
let libtest_stamp = match cmd { let libtest_stamp = match cmd {
"check" => check::libtest_stamp(self, compiler, target), "check" => check::libtest_stamp(self, cmp, target),
_ => compile::libstd_stamp(self, compiler, target), _ => compile::libstd_stamp(self, cmp, target),
}; };
let librustc_stamp = match cmd { let librustc_stamp = match cmd {
"check" => check::librustc_stamp(self, compiler, target), "check" => check::librustc_stamp(self, cmp, target),
_ => compile::librustc_stamp(self, compiler, target), _ => compile::librustc_stamp(self, cmp, target),
}; };
if cmd == "doc" { if cmd == "doc" {
if mode == Mode::Rustc || mode == Mode::ToolRustc { if mode == Mode::Rustc || mode == Mode::ToolRustc || mode == Mode::Codegen {
// This is the intended out directory for compiler documentation. // This is the intended out directory for compiler documentation.
my_out = self.compiler_doc_out(target); my_out = self.compiler_doc_out(target);
} }