Skip to content

Commit 100e956

Browse files
committed
Rollup merge of rust-lang#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.
2 parents 53d8c94 + 784528b commit 100e956

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/bootstrap/install.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,11 @@ install!((self, builder, _config),
186186
install_cargo(builder, self.stage, self.target);
187187
};
188188
Rls, "rls", _config.extended, only_hosts: true, {
189-
builder.ensure(dist::Rls { stage: self.stage, target: self.target });
190-
install_rls(builder, self.stage, self.target);
189+
if builder.ensure(dist::Rls { stage: self.stage, target: self.target }).is_some() {
190+
install_rls(builder, self.stage, self.target);
191+
} else {
192+
println!("skipping Install RLS stage{} ({})", self.stage, self.target);
193+
}
191194
};
192195
Analysis, "analysis", _config.extended, only_hosts: false, {
193196
builder.ensure(dist::Analysis {

0 commit comments

Comments
 (0)