From 0af399a282a5493a3e7324cc9e0fdb7224fb3888 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Tue, 24 Dec 2019 11:51:40 +0100 Subject: [PATCH 1/2] update miri --- src/tools/miri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/miri b/src/tools/miri index 048af409232fc..b1e97df8ee3d6 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit 048af409232fc2d7f8fbe5469080dc8bb702c498 +Subproject commit b1e97df8ee3d67b74b3408579f29b017c4c317ea From 04c740bee3f453cb06fbfa6581a2ee53023d39b9 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Tue, 24 Dec 2019 11:54:25 +0100 Subject: [PATCH 2/2] bootstrap miri: remove no longer used env var --- src/bootstrap/test.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 58dc8ffc17da2..f2a7d1d00cf28 100644 --- 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.