From 0cd03bf5f33751497444b03e51d1b4598dc46a7d Mon Sep 17 00:00:00 2001 From: matt rice Date: Thu, 26 Oct 2017 05:16:20 -0700 Subject: [PATCH 1/2] issue #45357 don't build clippy stage 1 --- src/bootstrap/tool.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 688ee6ba295..a8dfba55427 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -415,7 +415,10 @@ impl Step for Clippy { const ONLY_HOSTS: bool = true; fn should_run(run: ShouldRun) -> ShouldRun { - run.path("src/tools/clippy") + match run.builder.top_stage { + 1 => run.never(), + _ => run.path("src/tools/clippy"), + } } fn make_run(run: RunConfig) { From aa9d0aae99d84df9439f700c56ec3a84fdb1b10c Mon Sep 17 00:00:00 2001 From: matt rice Date: Sun, 29 Oct 2017 09:10:07 -0700 Subject: [PATCH 2/2] issue #45357 set clippy build condition to extended. --- src/bootstrap/tool.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index a8dfba55427..7175fed5410 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -415,10 +415,8 @@ impl Step for Clippy { const ONLY_HOSTS: bool = true; fn should_run(run: ShouldRun) -> ShouldRun { - match run.builder.top_stage { - 1 => run.never(), - _ => 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) {