Rollup merge of #70228 - lzutao:patch-1, r=Mark-Simulacrum

Remove CARGO_BUILD_TARGET from bootstrap.py Closes #70208
rust-lang · Mar 21, 2020 · 6e9720d · 6e9720d
2 parents 36d6e94 + a39e964
commit 6e9720d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
@@ -664,6 +664,10 @@ def build_bootstrap(self):
         if self.clean and os.path.exists(build_dir):
             shutil.rmtree(build_dir)
         env = os.environ.copy()
+        # `CARGO_BUILD_TARGET` breaks bootstrap build.
+        # See also: <https://github.com/rust-lang/rust/issues/70208>.
+        if "CARGO_BUILD_TARGET" in env:
+            del env["CARGO_BUILD_TARGET"]
         env["RUSTC_BOOTSTRAP"] = '1'
         env["CARGO_TARGET_DIR"] = build_dir
         env["RUSTC"] = self.rustc()