Skip to content

Commit

Permalink
Auto merge of rust-lang#69344 - RalfJung:miri, r=oli-obk
Browse files Browse the repository at this point in the history
bump Miri

Fixes rust-lang#69331

r? @ghost Cc @oli-obk
  • Loading branch information
bors committed Feb 24, 2020
2 parents d9a328a + ffa1aa6 commit 834bc56
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/bootstrap/test.rs
Expand Up @@ -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"));

Expand All @@ -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.
Expand Down

0 comments on commit 834bc56

Please sign in to comment.