Auto merge of #67579 - RalfJung:miri, r=RalfJung

update miri
rust-lang · Dec 24, 2019 · 84d8f9d · 84d8f9d
2 parents 6253754 + 04c740b
commit 84d8f9d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -384,9 +384,6 @@ impl Step for Miri {
             );
             cargo.arg("--bin").arg("cargo-miri").arg("--").arg("miri").arg("setup");
 
-            // Tell `cargo miri` not to worry about the sysroot mismatch (we built with
-            // stage1 but run with stage2).
-            cargo.env("MIRI_SKIP_SYSROOT_CHECK", "1");
             // Tell `cargo miri setup` where to find the sources.
             cargo.env("XARGO_RUST_SRC", builder.src.join("src"));
             // Debug things.

diff --git a/src/tools/miri b/src/tools/miri