Skip to content

Commit

Permalink
Rollup merge of rust-lang#45588 - Keruspe:master, r=alexcrichton
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
kennytm committed Nov 7, 2017
2 parents 8074361 + 784528b commit 843dc4b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/bootstrap/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 843dc4b

Please sign in to comment.