From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Mon, 11 Sep 2023 13:40:42 +0000 (+0100)
Subject: llvm-runtimes-builtins-build-check
X-Git-Tag: archive/raspbian/1%16.0.6-15+rpi1~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6fc5b20e3f20b66c8961bca4d77c9f02d96b858d;p=llvm-toolchain-16.git

llvm-runtimes-builtins-build-check

add a check and only set up and build compiler-rt builtins if they have
not been disabled

Gbp-Pq: Name llvm-runtimes-builtins-build-check.diff
---

diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index 04ed296bde..0c07424a1b 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -124,7 +124,12 @@ endfunction()
 # is required because the other runtimes need the builtin libraries present
 # before the just-built compiler can pass the configuration tests.
 get_compiler_rt_path(compiler_rt_path)
-if(compiler_rt_path)
+# check if builtins have been disabled
+set(RUNTIMES_BUILD_BUILTINS ON)
+if(DEFINED COMPILER_RT_BUILD_BUILTINS)
+  set(RUNTIMES_BUILD_BUILTINS ${COMPILER_RT_BUILD_BUILTINS})
+endif()
+if(compiler_rt_path AND RUNTIMES_BUILD_BUILTINS)
   if(NOT LLVM_BUILTIN_TARGETS)
     builtin_default_target(${compiler_rt_path}
       DEPENDS clang-resource-headers)