upstream fix for "Cannot represent a difference across sections"; rel 3

[packages/rust.git] / llvm-tools-install.patch

From 97740a648f57e24c45f641f2827598b26a2bf661 Mon Sep 17 00:00:00 2001
From: NagaChaitanya Vellanki <pnagato@protonmail.com>
Date: Fri, 17 Mar 2023 02:33:31 -0700
Subject: [PATCH] Check for llvm-tools before install

---
 src/bootstrap/install.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index ac3843c3344eb..42d895a3413fb 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 {