diff options
| author | kennytm <kennytm@gmail.com> | 2017-11-07 15:52:09 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2017-11-07 22:40:11 +0800 |
| commit | 843dc4bd76a337ae8fd49ea3edf619e781aa2cb1 (patch) | |
| tree | 97f0743afb687398c1ea97bc0326252d9ee4fc2f /src/bootstrap | |
| parent | 8074361f46bb79e2307e8c9ec002363ff324deae (diff) | |
| parent | 784528b8da35d1f82c696887c293b215f0a1b4b4 (diff) | |
| download | rust-843dc4bd76a337ae8fd49ea3edf619e781aa2cb1.tar.gz rust-843dc4bd76a337ae8fd49ea3edf619e781aa2cb1.zip | |
Rollup merge of #45588 - Keruspe:master, r=alexcrichton
rustbuild: don't try to install rls if ToolState is not Testing We already do that for the Dist Step so we would end up trying to install something that we didn't dist.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/install.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs index 5ca9cb5e521..c150459bee5 100644 --- a/src/bootstrap/install.rs +++ b/src/bootstrap/install.rs @@ -186,8 +186,11 @@ install!((self, builder, _config), install_cargo(builder, self.stage, self.target); }; Rls, "rls", _config.extended, only_hosts: true, { - builder.ensure(dist::Rls { stage: self.stage, target: self.target }); - install_rls(builder, self.stage, self.target); + if builder.ensure(dist::Rls { stage: self.stage, target: self.target }).is_some() { + install_rls(builder, self.stage, self.target); + } else { + println!("skipping Install RLS stage{} ({})", self.stage, self.target); + } }; Analysis, "analysis", _config.extended, only_hosts: false, { builder.ensure(dist::Analysis { |