diff options
| author | bors <bors@rust-lang.org> | 2025-06-07 09:21:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-06-07 09:21:38 +0000 |
| commit | 321dde12528a6baf0990ec611d33122b68c33fca (patch) | |
| tree | c9bd1eaf016ae3bb710c5b26b9bcd18eec89f645 | |
| parent | c57119b9a1c86968188bb9703a7859c17f8bc71c (diff) | |
| parent | 65730a3c4b0cc25bb9cb89af110d112b52aa9994 (diff) | |
| download | rust-321dde12528a6baf0990ec611d33122b68c33fca.tar.gz rust-321dde12528a6baf0990ec611d33122b68c33fca.zip | |
Auto merge of #141917 - petrochenkov:nobinroot, r=jieyouxu
bootstrap: Remove `rustc_snapshot_libdir` from PATH in one more place
Same as https://github.com/rust-lang/rust/pull/141657 but in a different part of the build system, with the same goal of addressing [#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).
It seems to work on windows-{gnu,msvc} and linux-gnu at least.
r? jieyouxu
| -rw-r--r-- | src/bootstrap/src/core/build_steps/tool.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs index 21a119e331e..9861637d8c8 100644 --- a/src/bootstrap/src/core/build_steps/tool.rs +++ b/src/bootstrap/src/core/build_steps/tool.rs @@ -1313,10 +1313,8 @@ impl Builder<'_> { // // Notably this munges the dynamic library lookup path to point to the // right location to run `compiler`. - let mut lib_paths: Vec<PathBuf> = vec![ - self.build.rustc_snapshot_libdir(), - self.cargo_out(compiler, Mode::ToolBootstrap, *host).join("deps"), - ]; + let mut lib_paths: Vec<PathBuf> = + vec![self.cargo_out(compiler, Mode::ToolBootstrap, *host).join("deps")]; // On MSVC a tool may invoke a C compiler (e.g., compiletest in run-make // mode) and that C compiler may need some extra PATH modification. Do |