From 1a0e2001bca6cbb3fc8496b83d5f847e11f459e6 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 21 Feb 2020 20:45:16 +0100 Subject: [PATCH] fix miri and bootstrap interaction --- src/bootstrap/test.rs | 4 +++- src/tools/miri | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index f939f79e4f4..4cfda606c4b 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -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. diff --git a/src/tools/miri b/src/tools/miri index 5b8462066d9..a3dad216eea 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit 5b8462066d99511a5ca119cbd3a1443ccf675714 +Subproject commit a3dad216eeab5be4ffb050afb9ab2b2c67ee4513