]> git.lizzy.rs Git - rust.git/commitdiff
rustbuild: don't try to install rls if ToolState is not Testing
authorMarc-Antoine Perennou <Marc-Antoine@Perennou.com>
Sat, 28 Oct 2017 07:54:05 +0000 (09:54 +0200)
committerMarc-Antoine Perennou <Marc-Antoine@Perennou.com>
Sat, 4 Nov 2017 14:49:18 +0000 (15:49 +0100)
The Dist Step is not ran in that case so we would end up trying to
install something that we didn't dist.

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
src/bootstrap/install.rs

index 608924c9c28d196b623d421a87e185030cbc59d5..1b5f6373c52f4d847f49581fd3c34051fed858c8 100644 (file)
@@ -186,8 +186,11 @@ fn run($sel, $builder: &Builder) {
         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 {