diff options
| author | bors <bors@rust-lang.org> | 2020-05-02 13:19:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-02 13:19:30 +0000 |
| commit | 53d3bc02ed90eba01c5dbc5b2d0c4cabb67ffb4d (patch) | |
| tree | 64b38c286370e25af3a7fa5ce9033f810cea754e /src/bootstrap/install.rs | |
| parent | 7184d137f65bb8d143ce8b5b664e50d33c4b5fbd (diff) | |
| parent | bce9fae97abb255c9fc6c994f50a052be4010a6f (diff) | |
Auto merge of #70655 - oli-obk:subrepo_funness, r=Mark-Simulacrum
Make clippy a git subtree instead of a git submodule r? @eddyb cc #70651 documentation at https://github.com/rust-lang/rust/pull/70654
Diffstat (limited to 'src/bootstrap/install.rs')
| -rw-r--r-- | src/bootstrap/install.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs index 6549262811b..fafd3cdf927 100644 --- a/src/bootstrap/install.rs +++ b/src/bootstrap/install.rs @@ -214,10 +214,8 @@ install!((self, builder, _config), } }; Clippy, "clippy", Self::should_build(_config), only_hosts: true, { - if builder.ensure(dist::Clippy { - compiler: self.compiler, - target: self.target, - }).is_some() || Self::should_install(builder) { + builder.ensure(dist::Clippy { compiler: self.compiler, target: self.target }); + if Self::should_install(builder) { install_clippy(builder, self.compiler.stage, self.target); } else { builder.info( |