about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2022-12-19 14:48:45 +0000
committerOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2022-12-19 14:48:45 +0000
commite5c92bc2b6f0bd69856ad3c4d3056c7f0c0ad72d (patch)
tree7fbe5e719f4e0d055e844b7b75f6842b864a12fa
parent10723378900ba2d25fc5d8baf785e1082f385832 (diff)
downloadrust-e5c92bc2b6f0bd69856ad3c4d3056c7f0c0ad72d.tar.gz
rust-e5c92bc2b6f0bd69856ad3c4d3056c7f0c0ad72d.zip
Don't panic on stable since miri is not available there
-rw-r--r--src/bootstrap/install.rs12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index c53d0d7e4cb..1815a097307 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -200,10 +200,14 @@ install!((self, builder, _config),
         install_sh(builder, "clippy", self.compiler.stage, Some(self.target), &tarball);
     };
     Miri, alias = "miri", Self::should_build(_config), only_hosts: true, {
-        let tarball = builder
-            .ensure(dist::Miri { compiler: self.compiler, target: self.target })
-            .expect("missing miri");
-        install_sh(builder, "miri", self.compiler.stage, Some(self.target), &tarball);
+        if let Some(tarball) = builder.ensure(dist::Miri { compiler: self.compiler, target: self.target }) {
+            install_sh(builder, "miri", self.compiler.stage, Some(self.target), &tarball);
+        } else {
+            // Miri is only available on nightly
+            builder.info(
+                &format!("skipping Install miri stage{} ({})", self.compiler.stage, self.target),
+            );
+        }
     };
     LlvmTools, alias = "llvm-tools", Self::should_build(_config), only_hosts: true, {
         let tarball = builder