Rollup merge of rust-lang#71346 - mati865:rustbuild-tools, r=Mark-Sim…

…ulacrum Do not build tools if user do not want them Fixes rust-lang#71307
rust-lang-ci · Apr 20, 2020 · 9a0e702 · 9a0e702
2 parents 42b533d + 9296d3b
commit 9a0e702
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
@@ -607,7 +607,15 @@ macro_rules! tool_extended {
 
             fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
                 let builder = run.builder;
-                run.path($path).default_condition(builder.config.extended)
+                run.path($path).default_condition(
+                    builder.config.extended
+                        && builder.config.tools.as_ref().map_or(true, |tools| {
+                            tools.iter().any(|tool| match tool.as_ref() {
+                                "clippy" => $tool_name == "clippy-driver",
+                                x => $tool_name == x,
+                            })
+                        }),
+                )
             }
 
             fn make_run(run: RunConfig<'_>) {