diff options
| author | bors <bors@rust-lang.org> | 2025-05-30 18:56:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-30 18:56:37 +0000 |
| commit | 70b3f4666e24ce22fc32f5e357dbcf85d3254e63 (patch) | |
| tree | 7c24c72116a97fd18a33742a0cad2d5e572e1272 | |
| parent | 15825b7161f8bd6a3482211fbf6727a52aa1166b (diff) | |
| parent | 043b164b3b64d5d1c8ec3ffd5bc594d1360ee464 (diff) | |
| download | rust-70b3f4666e24ce22fc32f5e357dbcf85d3254e63.tar.gz rust-70b3f4666e24ce22fc32f5e357dbcf85d3254e63.zip | |
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)
| -rw-r--r-- | src/bootstrap/bootstrap.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 42ad14a81d0..c60c6b8db64 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -1118,7 +1118,6 @@ class RustBuild(object): if "RUSTFLAGS_BOOTSTRAP" in env: env["RUSTFLAGS"] += " " + env["RUSTFLAGS_BOOTSTRAP"] - env["PATH"] = os.path.join(self.bin_root(), "bin") + os.pathsep + env["PATH"] if not os.path.isfile(self.cargo()): raise Exception("no cargo executable found at `{}`".format(self.cargo())) args = [ |