From 15aad5fcdb33a75e495a3d427228df62b6eadd5b Mon Sep 17 00:00:00 2001
From: Ximin Luo <infinity0@pwned.gg>
Date: Fri, 14 May 2021 19:22:41 +0100
Subject: [PATCH] bootstrap: build cargo only if requested in tools
---
src/bootstrap/tool.rs | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 4f2426648fd8a..6fc06896257b2 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -593,7 +593,14 @@ impl Step for Cargo {
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
let builder = run.builder;
- run.path("src/tools/cargo").default_condition(builder.config.extended)
+ run.path("src/tools/cargo").default_condition(
+ builder.config.extended
+ && builder.config.tools.as_ref().map_or(
+ true,
+ // If `tools` is set, search list for this tool.
+ |tools| tools.iter().any(|tool| tool == "cargo"),
+ ),
+ )
}
fn make_run(run: RunConfig<'_>) {