user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor Builder::cargo, clean deps for cmd!=test

Browse source
This commit is contained in:
Collins Abitekaniza 2018-09-17 14:19:44 +03:00
parent 9681e13bb2
commit 5ae40be851
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/bootstrap/builder.rs
View file

@ -750,11 +750,10 @@ impl<'a> Builder<'a> {
}
let rustdoc = self.rustdoc(compiler.host);
self.clear_if_dirty(&my_out, &rustdoc);
} else {
} else if cmd != "test" {
match mode {
Mode::Std => {
self.clear_if_dirty(&my_out, &self.rustc(compiler));
self.clear_if_dirty(&my_out, &libstd_stamp);
},
Mode::Test => {
self.clear_if_dirty(&my_out, &libstd_stamp);
@ -765,9 +764,7 @@ impl<'a> Builder<'a> {
self.clear_if_dirty(&my_out, &libtest_stamp);
},
Mode::Codegen => {
self.clear_if_dirty(&my_out, &self.rustc(compiler));
self.clear_if_dirty(&my_out, &libstd_stamp);
self.clear_if_dirty(&my_out, &libtest_stamp);
self.clear_if_dirty(&my_out, &librustc_stamp);
},
Mode::ToolBootstrap => { },
Mode::ToolStd => {

1
src/bootstrap/compile.rs
View file

@ -655,7 +655,6 @@ impl Step for CodegenBackend {
}
let out_dir = builder.cargo_out(compiler, Mode::Codegen, target);
builder.clear_if_dirty(&out_dir, &librustc_stamp(builder, compiler, target));
let mut cargo = builder.cargo(compiler, Mode::Codegen, target, "rustc");
cargo.arg("--manifest-path")