From 53897921bdd74979ecd7b0e3c649d8cddffeb783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E6=9D=B0=E5=8F=8B=20Jieyou=20Xu=20=28Joe=29?= Date: Mon, 23 Sep 2024 07:54:05 +0000 Subject: [PATCH] Fix `run-make-support` to respect per-stage cargo --- src/tools/run-make-support/src/external_deps/cargo.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tools/run-make-support/src/external_deps/cargo.rs b/src/tools/run-make-support/src/external_deps/cargo.rs index b0e045dc80b..e91d101cb99 100644 --- a/src/tools/run-make-support/src/external_deps/cargo.rs +++ b/src/tools/run-make-support/src/external_deps/cargo.rs @@ -1,7 +1,8 @@ use crate::command::Command; use crate::env_var; -/// Returns a command that can be used to invoke Cargo. +/// Returns a command that can be used to invoke cargo. The cargo is provided by compiletest +/// through the `CARGO` env var. pub fn cargo() -> Command { - Command::new(env_var("BOOTSTRAP_CARGO")) + Command::new(env_var("CARGO")) }