mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #105901 - oli-obk:no_miri_on_stable, r=Mark-Simulacrum

Browse Source 
Don't panic on stable since miri is not available there

fixes #105816
This commit is contained in:
Matthias Krüger 2022-12-20 08:51:14 +01:00 committed by GitHub
commit bcb75e61ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bootstrap/install.rs
View File

@ -200,10 +200,14 @@ fn run($sel, $builder: &Builder<'_>) {
install_sh(builder, "clippy", self.compiler.stage, Some(self.target), &tarball); install_sh(builder, "clippy", self.compiler.stage, Some(self.target), &tarball);
}; };
Miri, alias = "miri", Self::should_build(_config), only_hosts: true, { Miri, alias = "miri", Self::should_build(_config), only_hosts: true, {
let tarball = builder if let Some(tarball) = builder.ensure(dist::Miri { compiler: self.compiler, target: self.target }) {
.ensure(dist::Miri { compiler: self.compiler, target: self.target }) install_sh(builder, "miri", self.compiler.stage, Some(self.target), &tarball);
.expect("missing miri"); } else {
install_sh(builder, "miri", self.compiler.stage, Some(self.target), &tarball); // 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, { LlvmTools, alias = "llvm-tools", Self::should_build(_config), only_hosts: true, {
let tarball = builder let tarball = builder