Use the same RUSTFLAGS for building and testing bootstrap

Fixes #49215
rust-lang · Mar 23, 2018 · e993e62 · e993e62
1 parent cc34ca1
commit e993e62
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -1679,6 +1679,12 @@ impl Step for Bootstrap {
            .env("CARGO_TARGET_DIR", build.out.join("bootstrap"))
            .env("RUSTC_BOOTSTRAP", "1")
            .env("RUSTC", &build.initial_rustc);
+        if let Some(flags) = option_env!("RUSTFLAGS") {
+            // Use the same rustc flags for testing as for "normal" compilation,
+            // so that Cargo doesn’t recompile the entire dependency graph every time:
+            // https://github.com/rust-lang/rust/issues/49215
+            cmd.env("RUSTFLAGS", flags);
+        }
         if !build.fail_fast {
             cmd.arg("--no-fail-fast");
         }