about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorEric Huss <eric@huss.org>2021-07-09 10:01:23 -0700
committerEric Huss <eric@huss.org>2021-07-09 10:38:28 -0700
commitf698cacc33f0c9148bb3bb7501087b0d37e837ec (patch)
tree17627327ce692f1d249f9ffae54bbb0f4ff66ad8 /src/bootstrap
parentee86f96ba176f598d64dc9f3bb7e074d5b8b86b6 (diff)
downloadrust-f698cacc33f0c9148bb3bb7501087b0d37e837ec.tar.gz
rust-f698cacc33f0c9148bb3bb7501087b0d37e837ec.zip
Fix rust-analyzer install when not available.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/install.rs13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index 13ee909afd5..6f3054538a8 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -165,10 +165,15 @@ install!((self, builder, _config),
         }
     };
     RustAnalyzer, "rust-analyzer", Self::should_build(_config), only_hosts: true, {
-        let tarball = builder
-            .ensure(dist::RustAnalyzer { compiler: self.compiler, target: self.target })
-            .expect("missing rust-analyzer");
-        install_sh(builder, "rust-analyzer", self.compiler.stage, Some(self.target), &tarball);
+        if let Some(tarball) =
+            builder.ensure(dist::RustAnalyzer { compiler: self.compiler, target: self.target })
+        {
+            install_sh(builder, "rust-analyzer", self.compiler.stage, Some(self.target), &tarball);
+        } else {
+            builder.info(
+                &format!("skipping Install rust-analyzer stage{} ({})", self.compiler.stage, self.target),
+            );
+        }
     };
     Clippy, "clippy", Self::should_build(_config), only_hosts: true, {
         let tarball = builder.ensure(dist::Clippy { compiler: self.compiler, target: self.target });