Skip to content

Commit 6e9720d

Browse files
authored
Rollup merge of #70228 - lzutao:patch-1, r=Mark-Simulacrum
Remove CARGO_BUILD_TARGET from bootstrap.py Closes #70208
2 parents 36d6e94 + a39e964 commit 6e9720d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/bootstrap/bootstrap.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,10 @@ def build_bootstrap(self):
664664
if self.clean and os.path.exists(build_dir):
665665
shutil.rmtree(build_dir)
666666
env = os.environ.copy()
667+
# `CARGO_BUILD_TARGET` breaks bootstrap build.
668+
# See also: <https://github.com/rust-lang/rust/issues/70208>.
669+
if "CARGO_BUILD_TARGET" in env:
670+
del env["CARGO_BUILD_TARGET"]
667671
env["RUSTC_BOOTSTRAP"] = '1'
668672
env["CARGO_TARGET_DIR"] = build_dir
669673
env["RUSTC"] = self.rustc()

0 commit comments

Comments
 (0)