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

fix miri and bootstrap interaction

Browse Source
This commit is contained in:
Ralf Jung 2020-02-21 20:45:16 +01:00
parent 821c4408f9
commit 1a0e2001bc
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/test.rs
View File

@ -388,6 +388,8 @@ impl Step for Miri {
cargo.env("XARGO_RUST_SRC", builder.src.join("src"));
// Debug things.
cargo.env("RUST_BACKTRACE", "1");
// Overwrite bootstrap's `rustc` wrapper overwriting our flags.
cargo.env("RUSTC_DEBUG_ASSERTIONS", "true");
// Let cargo-miri know where xargo ended up.
cargo.env("XARGO", builder.out.join("bin").join("xargo"));
@ -397,7 +399,7 @@ impl Step for Miri {
}
// # Determine where Miri put its sysroot.
// To this end, we run `cargo miri setup --env` and capture the output.
// To this end, we run `cargo miri setup --print-sysroot` and capture the output.
// (We do this separately from the above so that when the setup actually
// happens we get some output.)
// We re-use the `cargo` from above.

2
src/tools/miri

@ -1 +1 @@
Subproject commit 5b8462066d99511a5ca119cbd3a1443ccf675714
Subproject commit a3dad216eeab5be4ffb050afb9ab2b2c67ee4513