bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

bootstrap: build cargo only if requested in tools

Browse source
This commit is contained in:
Ximin Luo 2021-05-14 19:22:41 +01:00
parent 75da570d78
commit 15aad5fcdb
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/bootstrap/tool.rs
View file

@ -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<'_>) {