bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

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

Browse source 
update miri
This commit is contained in:
bors 2019-12-24 11:38:45 +00:00
commit 84d8f9ddd3
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/bootstrap/test.rs
View file

@ -384,9 +384,6 @@ impl Step for Miri {
); );
cargo.arg("--bin").arg("cargo-miri").arg("--").arg("miri").arg("setup"); 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. // 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("src"));
// Debug things. // Debug things.

2
src/tools/miri

@ -1 +1 @@
Subproject commit 048af409232fc2d7f8fbe5469080dc8bb702c498 Subproject commit b1e97df8ee3d67b74b3408579f29b017c4c317ea