From 327ae38a0b6482f5414e74a18a70585249cc3cb7 Mon Sep 17 00:00:00 2001 From: Ralf Jung <post@ralfj.de> Date: Fri, 25 Oct 2019 09:22:17 +0200 Subject: [PATCH] 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 3774f4038e1..60f0dccdb07 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);