diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-12-20 08:51:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-20 08:51:14 +0100 |
| commit | bcb75e61abc1be1da63a781b737cad9b273ee411 (patch) | |
| tree | cc10fee72550c017bd59b6d4d36b1079d57ca082 | |
| parent | 7f42e58effa3871dda6a41e250dea60cf88868ca (diff) | |
| parent | e5c92bc2b6f0bd69856ad3c4d3056c7f0c0ad72d (diff) | |
| download | rust-bcb75e61abc1be1da63a781b737cad9b273ee411.tar.gz rust-bcb75e61abc1be1da63a781b737cad9b273ee411.zip | |
Rollup merge of #105901 - oli-obk:no_miri_on_stable, r=Mark-Simulacrum
Don't panic on stable since miri is not available there fixes #105816
| -rw-r--r-- | src/bootstrap/install.rs | 12 |
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 |