Skip to content

Commit 70b3f46

Browse files
committed
Auto merge of #141657 - petrochenkov:nobinroot, r=jieyouxu
bootstrap: Remove `bin_root` from `PATH` It's not currently load bearing in typical setups on typical targets. Basically, if it passes the standard CI, then we can remove it, I think. If someone later reports this breaking the build, then we can address it in a more fine grained way. E.g. add it to `PATH` last and not first, only on specific targets, and only if specific files are not already found in `PATH` directories. Fixes [#t-infra/bootstrap > Build broken in MSYS2 @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Build.20broken.20in.20MSYS2/near/520709527)
2 parents 15825b7 + 043b164 commit 70b3f46

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

src/bootstrap/bootstrap.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,6 @@ def build_bootstrap_cmd(self, env):
11181118
if "RUSTFLAGS_BOOTSTRAP" in env:
11191119
env["RUSTFLAGS"] += " " + env["RUSTFLAGS_BOOTSTRAP"]
11201120

1121-
env["PATH"] = os.path.join(self.bin_root(), "bin") + os.pathsep + env["PATH"]
11221121
if not os.path.isfile(self.cargo()):
11231122
raise Exception("no cargo executable found at `{}`".format(self.cargo()))
11241123
args = [

0 commit comments

Comments
 (0)