1 From 97740a648f57e24c45f641f2827598b26a2bf661 Mon Sep 17 00:00:00 2001
2 From: NagaChaitanya Vellanki <pnagato@protonmail.com>
3 Date: Fri, 17 Mar 2023 02:33:31 -0700
4 Subject: [PATCH] Check for llvm-tools before install
7 src/bootstrap/install.rs | 11 +++++++----
8 1 file changed, 7 insertions(+), 4 deletions(-)
10 diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
11 index ac3843c3344eb..42d895a3413fb 100644
12 --- a/src/bootstrap/install.rs
13 +++ b/src/bootstrap/install.rs
14 @@ -210,10 +210,13 @@ install!((self, builder, _config),
17 LlvmTools, alias = "llvm-tools", Self::should_build(_config), only_hosts: true, {
18 - let tarball = builder
19 - .ensure(dist::LlvmTools { target: self.target })
20 - .expect("missing llvm-tools");
21 - install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball);
22 + if let Some(tarball) = builder.ensure(dist::LlvmTools { target: self.target }) {
23 + install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball);
26 + &format!("skipping llvm-tools stage{} ({}): external LLVM", self.compiler.stage, self.target),
30 Rustfmt, alias = "rustfmt", Self::should_build(_config), only_hosts: true, {
31 if let Some(tarball) = builder.ensure(dist::Rustfmt {