mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix not finding the right libraries on Windows

Browse source
This commit is contained in:
Ralf Jung 2024-03-31 23:09:33 +02:00
parent 4797fba3b7
commit b08b06e3a8
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/bootstrap/src/core/builder.rs
View file

@ -1271,9 +1271,15 @@ impl<'a> Builder<'a> {
let mut cmd = Command::new(cargo_miri); let mut cmd = Command::new(cargo_miri);
cmd.env("MIRI", &miri); cmd.env("MIRI", &miri);
cmd.env("CARGO", &self.initial_cargo); cmd.env("CARGO", &self.initial_cargo);
// Need to add the run_compiler libs. Not entirely sure why that has to be one stage up from // Need to add the `run_compiler` libs. Those are the libs produces *by* `build_compiler`,
// what Miri was built for. // so they match the Miri we just built. However this means they are actually living one
self.add_rustc_lib_path(run_compiler, &mut cmd); // stage up, i.e. we are running `stage0-tools-bin/miri` with the libraries in `stage1/lib`.
// This is an unfortunate off-by-1 caused (possibly) by the fact that Miri doesn't have an
// "assemble" step like rustc does that would cross the stage boundary. We can't use
// `add_rustc_lib_path` as that's a NOP on Windows but we do need these libraries added to
// the PATH due to the stage mismatch.
// Also see https://github.com/rust-lang/rust/pull/123192#issuecomment-2028901503.
add_dylib_path(self.rustc_lib_paths(run_compiler), &mut cmd);
cmd cmd
} }