Skip to content

Commit 8669f7e

Browse files
oli-obkMark-Simulacrum
authored andcommitted
Don't panic on stable since miri is not available there
1 parent d2f7d92 commit 8669f7e

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
Rustfmt, alias = "rustfmt", Self::should_build(_config), only_hosts: true, {
209213
if let Some(tarball) = builder.ensure(dist::Rustfmt {

0 commit comments

Comments
 (0)