nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix testing Miri with --stage 0

Browse Source
This commit is contained in:
Ralf Jung 2021-06-03 11:37:17 +02:00
parent 2f601ef527
commit 9e674af669
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bootstrap/builder.rs
View File

@ -709,7 +709,15 @@ impl<'a> Builder<'a> {
return;
}
add_dylib_path(vec![self.rustc_libdir(compiler)], cmd);
let mut dylib_dirs = vec![self.rustc_libdir(compiler)];
// Ensure that the downloaded LLVM libraries can be found.
if self.config.llvm_from_ci {
let ci_llvm_lib = self.out.join(&*compiler.host.triple).join("ci-llvm").join("lib");
dylib_dirs.push(ci_llvm_lib);
}
add_dylib_path(dylib_dirs, cmd);
}
/// Gets a path to the compiler specified.

4
src/bootstrap/test.rs
View File

@ -449,6 +449,7 @@ impl Step for Miri {
SourceType::Submodule,
&[],
);
cargo.add_rustc_lib_path(builder, compiler);
cargo.arg("--").arg("miri").arg("setup");
// Tell `cargo miri setup` where to find the sources.
@ -500,6 +501,7 @@ impl Step for Miri {
SourceType::Submodule,
&[],
);
cargo.add_rustc_lib_path(builder, compiler);
// miri tests need to know about the stage sysroot
cargo.env("MIRI_SYSROOT", miri_sysroot);
@ -508,8 +510,6 @@ impl Step for Miri {
cargo.arg("--").args(builder.config.cmd.test_args());
cargo.add_rustc_lib_path(builder, compiler);
let mut cargo = Command::from(cargo);
if !try_run(builder, &mut cargo) {
return;

1
src/bootstrap/util.rs
View File

@ -45,6 +45,7 @@ pub fn libdir(target: TargetSelection) -> &'static str {
}
/// Adds a list of lookup paths to `cmd`'s dynamic library lookup path.
/// If The dylib_path_par is already set for this cmd, the old value will be overwritten!
pub fn add_dylib_path(path: Vec<PathBuf>, cmd: &mut Command) {
let mut list = dylib_path();
for path in path {