diff options
| author | Collins Abitekaniza <abtcolns@gmail.com> | 2018-07-10 22:37:30 +0300 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-09-12 13:31:51 -0600 |
| commit | de3ec8dd1a2c0fbc09b025e7d7276f91f72420d9 (patch) | |
| tree | 0130d1e730881874a5fb64ddb4b0bd66119273d4 /src/bootstrap | |
| parent | 86e34cdd1b548c4a0f938fa3cb89f0db38f6b6fa (diff) | |
| download | rust-de3ec8dd1a2c0fbc09b025e7d7276f91f72420d9.tar.gz rust-de3ec8dd1a2c0fbc09b025e7d7276f91f72420d9.zip | |
nit: rearrange and make match exhaustive
also indicate difference between out_dir and my_out
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/builder.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index dc27fd56fb0..03608518da1 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -709,6 +709,7 @@ impl<'a> Builder<'a> { let mut cargo = Command::new(&self.initial_cargo); let out_dir = self.stage_out(compiler, mode); + // command specific path, we call clear_if_dirty with this let mut my_out = match cmd { "build" => self.cargo_out(compiler, mode, target), @@ -754,20 +755,22 @@ impl<'a> Builder<'a> { Mode::Std => { self.clear_if_dirty(&my_out, &self.rustc(compiler)); }, + Mode::Test => { + self.clear_if_dirty(&my_out, &libstd_stamp); + }, Mode::Rustc => { 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); }, - Mode::Test => { - self.clear_if_dirty(&my_out, &libstd_stamp); - }, + Mode::Codegen => { }, + Mode::ToolStd => { }, + Mode::ToolTest => { }, Mode::ToolRustc => { self.clear_if_dirty(&my_out, &libstd_stamp); self.clear_if_dirty(&my_out, &libtest_stamp); self.clear_if_dirty(&my_out, &librustc_stamp); - } - _ => { } + }, } } |
