diff options
| author | bors <bors@rust-lang.org> | 2019-12-24 11:38:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-24 11:38:45 +0000 |
| commit | 84d8f9ddd3819501735d30b3c584c6935ef6c9da (patch) | |
| tree | ab54342568debc19d04dae4dcaa3342f229c0a48 | |
| parent | 625375400cdd172877e81c3ce44ce68f2011af2d (diff) | |
| parent | 04c740bee3f453cb06fbfa6581a2ee53023d39b9 (diff) | |
| download | rust-84d8f9ddd3819501735d30b3c584c6935ef6c9da.tar.gz rust-84d8f9ddd3819501735d30b3c584c6935ef6c9da.zip | |
Auto merge of #67579 - RalfJung:miri, r=RalfJung
update miri
| -rw-r--r-- | src/bootstrap/test.rs | 3 | ||||
| m--------- | src/tools/miri | 16 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 58dc8ffc17d..f2a7d1d00cf 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. diff --git a/src/tools/miri b/src/tools/miri -Subproject 048af409232fc2d7f8fbe5469080dc8bb702c49 +Subproject b1e97df8ee3d67b74b3408579f29b017c4c317e |