Skip to content

Commit 321dde1

Browse files
committed
Auto merge of #141917 - petrochenkov:nobinroot, r=jieyouxu
bootstrap: Remove `rustc_snapshot_libdir` from PATH in one more place Same as #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
2 parents c57119b + 65730a3 commit 321dde1

File tree

1 file changed

+2
-4
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+2
-4
lines changed

src/bootstrap/src/core/build_steps/tool.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,10 +1313,8 @@ impl Builder<'_> {
13131313
//
13141314
// Notably this munges the dynamic library lookup path to point to the
13151315
// right location to run `compiler`.
1316-
let mut lib_paths: Vec<PathBuf> = vec![
1317-
self.build.rustc_snapshot_libdir(),
1318-
self.cargo_out(compiler, Mode::ToolBootstrap, *host).join("deps"),
1319-
];
1316+
let mut lib_paths: Vec<PathBuf> =
1317+
vec![self.cargo_out(compiler, Mode::ToolBootstrap, *host).join("deps")];
13201318

13211319
// On MSVC a tool may invoke a C compiler (e.g., compiletest in run-make
13221320
// mode) and that C compiler may need some extra PATH modification. Do

0 commit comments

Comments
 (0)