Rollup merge of rust-lang#45548 - ratmice:master, r=oli-obk

kennytm · web-flow · commit 9ca6ee0299d7 · 2017-11-04T13:49:26.000+08:00
issue rust-lang#45357 don't build clippy stage 1 rust-lang#45357 Wasn't sure top_stage was the right thing, but seemed to go ahead building clippy stage 2.
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,8 @@ impl Step for Clippy {`
`415`	`415`	`const ONLY_HOSTS: bool = true;`
`416`	`416`
`417`	`417`	`fn should_run(run: ShouldRun) -> ShouldRun {`
`418`		`- run.path("src/tools/clippy")`
	`418`	`+ let builder = run.builder;`
	`419`	`+ run.path("src/tools/clippy").default_condition(builder.build.config.extended)`
`419`	`420`	`}`
`420`	`421`
`421`	`422`	`fn make_run(run: RunConfig) {`