From 5ae40be85191c365985e9231f5c015fddbadd6c0 Mon Sep 17 00:00:00 2001
From: Collins Abitekaniza <abtcolns@gmail.com>
Date: Mon, 17 Sep 2018 14:19:44 +0300
Subject: [PATCH] refactor Builder::cargo, clean deps for cmd!=test

---
 src/bootstrap/builder.rs | 7 ++-----
 src/bootstrap/compile.rs | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 13449f0e00f97..861f47484b96e 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -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 => {
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index ff6d2b504d265..287b03f6c491d 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -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")