X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fbootstrap%2Finstall.rs;h=1815a0973072bd741e4699332268aa3c7ce77f5b;hb=0a08ab129db6c514e91cd3faae02ec7d03eb4949;hp=c53d0d7e4cb7c03964ec1f2364c6a7a2600cadfa;hpb=2b094b1ede1cb04095a3210eb2f40f398d4a832a;p=rust.git

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 @@ fn run($sel, $builder: &Builder<'_>) {
         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