diff options
| author | bors <bors@rust-lang.org> | 2022-12-20 10:20:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-20 10:20:27 +0000 |
| commit | 8a746f4ac3a489efb724cde813607f3b96c2df7b (patch) | |
| tree | c1a88a68650bff13ac0b61a0195f89c58e1a850a /src/bootstrap | |
| parent | eb9e5e711d3eef1998ff24ac2bc57386662652e9 (diff) | |
| parent | 051c52a72705035e1d18b4204de6ae4c8248aca0 (diff) | |
Auto merge of #105940 - matthiaskrgr:rollup-ho4po1t, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #105901 (Don't panic on stable since miri is not available there) - #105912 (rustdoc: force pre tags to have the default line height) - #105914 (rustdoc: Simplify CSS for scraped code examples code blocks) - #105933 (Add readable rustdoc display for tvOS and watchOS) - #105935 (docs/test: add UI test and long-form error docs for `E0377`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -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 |