Skip to content

Commit 834bc56

Browse files
committed
Auto merge of rust-lang#69344 - RalfJung:miri, r=oli-obk
bump Miri Fixes rust-lang#69331 r? @ghost Cc @oli-obk
2 parents d9a328a + ffa1aa6 commit 834bc56

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/bootstrap/test.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,8 @@ impl Step for Miri {
388388
cargo.env("XARGO_RUST_SRC", builder.src.join("src"));
389389
// Debug things.
390390
cargo.env("RUST_BACKTRACE", "1");
391+
// Overwrite bootstrap's `rustc` wrapper overwriting our flags.
392+
cargo.env("RUSTC_DEBUG_ASSERTIONS", "true");
391393
// Let cargo-miri know where xargo ended up.
392394
cargo.env("XARGO", builder.out.join("bin").join("xargo"));
393395

@@ -397,7 +399,7 @@ impl Step for Miri {
397399
}
398400

399401
// # Determine where Miri put its sysroot.
400-
// To this end, we run `cargo miri setup --env` and capture the output.
402+
// To this end, we run `cargo miri setup --print-sysroot` and capture the output.
401403
// (We do this separately from the above so that when the setup actually
402404
// happens we get some output.)
403405
// We re-use the `cargo` from above.

0 commit comments

Comments
 (0)