From 1166db7603de6a94f3d7b25b83c2b08e7176366c Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 24 Oct 2019 12:04:05 +0200 Subject: [PATCH 1/4] update Miri --- src/tools/miri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/miri b/src/tools/miri index fccb239824880..1bf282ff09d10 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit fccb2398248802a268fcda544ff3945247ef2119 +Subproject commit 1bf282ff09d10ee88c4fa43ce0820a9bcc2441e4 From f809f9e08f57f0a181af35358a893c271979f228 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 24 Oct 2019 15:39:20 +0200 Subject: [PATCH 2/4] bootstrap now takes care of installing xargo --- src/bootstrap/test.rs | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 7ed67c6c7c5d5..3774f4038e113 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -386,8 +386,27 @@ impl Step for Miri { extra_features: Vec::new(), }); if let Some(miri) = miri { + // # Install xargo. + let mut cargo = tool::prepare_tool_cargo( + builder, + compiler, + Mode::ToolRustc, + host, + "install", + "src/tools/miri", + SourceType::Submodule, + &[], + ); + 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 +431,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); From 327ae38a0b6482f5414e74a18a70585249cc3cb7 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 25 Oct 2019 09:22:17 +0200 Subject: [PATCH 3/4] use plain cargo to install xargo --- src/bootstrap/test.rs | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 3774f4038e113..60f0dccdb070e 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -386,17 +386,7 @@ impl Step for Miri { extra_features: Vec::new(), }); if let Some(miri) = miri { - // # Install xargo. - let mut cargo = tool::prepare_tool_cargo( - builder, - compiler, - Mode::ToolRustc, - host, - "install", - "src/tools/miri", - SourceType::Submodule, - &[], - ); + 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); From 58da335e83950a440dd2705ca55b456264e64e45 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 26 Oct 2019 10:14:56 +0200 Subject: [PATCH 4/4] update miri --- src/tools/miri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/miri b/src/tools/miri index 1bf282ff09d10..d9ae0285169e5 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit 1bf282ff09d10ee88c4fa43ce0820a9bcc2441e4 +Subproject commit d9ae0285169e52050416fb3618f05b5fdf582b6b