squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #65758 - RalfJung:miri, r=oli-obk

Browse source 
update Miri

Fixes https://github.com/rust-lang/rust/issues/65684
This commit is contained in:
bors 2019-10-26 09:19:48 +00:00
commit 8318ef26c1
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/bootstrap/test.rs
View file

@ -386,8 +386,17 @@ impl Step for Miri {
extra_features: Vec::new(),
});
if let Some(miri) = miri {
let mut cargo = builder.cargo(compiler, Mode::ToolRustc, host, "install");
cargo.arg("xargo");
// Configure `cargo install` path. cargo adds a `bin/`.
cargo.env("CARGO_INSTALL_ROOT", &builder.out);
let mut cargo = Command::from(cargo);
if !try_run(builder, &mut cargo) {
return;
}
// # Run `cargo miri setup`.
// As a side-effect, this will install xargo.
let mut cargo = tool::prepare_tool_cargo(
builder,
compiler,
@ -412,9 +421,7 @@ impl Step for Miri {
cargo.env("XARGO_RUST_SRC", builder.src.join("src"));
// Debug things.
cargo.env("RUST_BACKTRACE", "1");
// Configure `cargo install` path, and let cargo-miri know that that's where
// xargo ends up.
cargo.env("CARGO_INSTALL_ROOT", &builder.out); // cargo adds a `bin/`
// Let cargo-miri know where xargo ended up.
cargo.env("XARGO", builder.out.join("bin").join("xargo"));
let mut cargo = Command::from(cargo);

2
src/tools/miri

@ -1 +1 @@
Subproject commit fccb2398248802a268fcda544ff3945247ef2119
Subproject commit d9ae0285169e52050416fb3618f05b5fdf582b6b