about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2017-11-04 13:49:26 +0800
committerGitHub <noreply@github.com>2017-11-04 13:49:26 +0800
commit9ca6ee0299d79b3988ba93ce4bc9be3a7e64acde (patch)
treefc5f7f7347e0b83a81dd5962e087ffaf698dc68a
parent95a401609f3b2cd1602bbfc442606c6172beebb5 (diff)
parentaa9d0aae99d84df9439f700c56ec3a84fdb1b10c (diff)
downloadrust-9ca6ee0299d79b3988ba93ce4bc9be3a7e64acde.tar.gz
rust-9ca6ee0299d79b3988ba93ce4bc9be3a7e64acde.zip
Rollup merge of #45548 - ratmice:master, r=oli-obk
issue #45357 don't build clippy stage 1

#45357
Wasn't sure top_stage was the right thing, but seemed to go ahead building clippy stage 2.
-rw-r--r--src/bootstrap/tool.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 688ee6ba295..7175fed5410 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -415,7 +415,8 @@ impl Step for Clippy {
     const ONLY_HOSTS: bool = true;
 
     fn should_run(run: ShouldRun) -> ShouldRun {
-        run.path("src/tools/clippy")
+        let builder = run.builder;
+        run.path("src/tools/clippy").default_condition(builder.build.config.extended)
     }
 
     fn make_run(run: RunConfig) {