diff options
| author | bors <bors@rust-lang.org> | 2020-07-30 18:29:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-30 18:29:08 +0000 |
| commit | 438c59f010016a8a3a11fbcc4c18ae555d7adf94 (patch) | |
| tree | 6d40d3a71b20cc5be2117c92122448f623b30578 | |
| parent | 6b09c37ddc240e25748e53d7a8f81f252def6dee (diff) | |
| parent | 1a2208afc5ef525649b12a9a0a01425390ca44a5 (diff) | |
| download | rust-438c59f010016a8a3a11fbcc4c18ae555d7adf94.tar.gz rust-438c59f010016a8a3a11fbcc4c18ae555d7adf94.zip | |
Auto merge of #74908 - RalfJung:miri, r=RalfJung
update Miri Fixes https://github.com/rust-lang/rust/issues/74580 Cc @rust-lang/miri r? @ghost
| -rw-r--r-- | src/bootstrap/test.rs | 2 | ||||
| m--------- | src/tools/miri | 43 |
2 files changed, 10 insertions, 35 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 05af7210b1c..2ead5d0a37f 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -393,7 +393,7 @@ impl Step for Miri { cargo.arg("--").arg("miri").arg("setup"); // Tell `cargo miri setup` where to find the sources. - cargo.env("XARGO_RUST_SRC", builder.src.join("src")); + cargo.env("XARGO_RUST_SRC", builder.src.join("library")); // Tell it where to find Miri. cargo.env("MIRI", &miri); // Debug things. diff --git a/src/tools/miri b/src/tools/miri -Subproject 515287f114b546a72d4a1fe8ffe1dbc20dedf13 +Subproject 55bdb3174653039f47362742f8dc941bfc086e8 |