diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-03-18 00:05:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 00:05:55 +0100 |
| commit | 01edab6024fb59a4f9740366a5017e39108cd1a3 (patch) | |
| tree | 2d5a0793b8c2ce0eaa9f0636f65ab63214280d8a /src/bootstrap | |
| parent | 7e5705e5c657d7e29527406df06e64300b93fd82 (diff) | |
| parent | 97740a648f57e24c45f641f2827598b26a2bf661 (diff) | |
| download | rust-01edab6024fb59a4f9740366a5017e39108cd1a3.tar.gz rust-01edab6024fb59a4f9740366a5017e39108cd1a3.zip | |
Rollup merge of #109256 - chaitanyav:fix_108948, r=albertlarsan68
Check for llvm-tools before install Fixes #108948 ````@jpalus```` Please review
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/install.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs index ac3843c3344..42d895a3413 100644 --- a/src/bootstrap/install.rs +++ b/src/bootstrap/install.rs @@ -210,10 +210,13 @@ install!((self, builder, _config), } }; LlvmTools, alias = "llvm-tools", Self::should_build(_config), only_hosts: true, { - let tarball = builder - .ensure(dist::LlvmTools { target: self.target }) - .expect("missing llvm-tools"); - install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball); + if let Some(tarball) = builder.ensure(dist::LlvmTools { target: self.target }) { + install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball); + } else { + builder.info( + &format!("skipping llvm-tools stage{} ({}): external LLVM", self.compiler.stage, self.target), + ); + } }; Rustfmt, alias = "rustfmt", Self::should_build(_config), only_hosts: true, { if let Some(tarball) = builder.ensure(dist::Rustfmt { |