Skip to content

Commit bcb75e6

Browse files
authored
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
2 parents 7f42e58 + e5c92bc commit bcb75e6

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/bootstrap/install.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,14 @@ install!((self, builder, _config),
200200
install_sh(builder, "clippy", self.compiler.stage, Some(self.target), &tarball);
201201
};
202202
Miri, alias = "miri", Self::should_build(_config), only_hosts: true, {
203-
let tarball = builder
204-
.ensure(dist::Miri { compiler: self.compiler, target: self.target })
205-
.expect("missing miri");
206-
install_sh(builder, "miri", self.compiler.stage, Some(self.target), &tarball);
203+
if let Some(tarball) = builder.ensure(dist::Miri { compiler: self.compiler, target: self.target }) {
204+
install_sh(builder, "miri", self.compiler.stage, Some(self.target), &tarball);
205+
} else {
206+
// Miri is only available on nightly
207+
builder.info(
208+
&format!("skipping Install miri stage{} ({})", self.compiler.stage, self.target),
209+
);
210+
}
207211
};
208212
LlvmTools, alias = "llvm-tools", Self::should_build(_config), only_hosts: true, {
209213
let tarball = builder

0 commit comments

Comments
 (0)