From: LLVM Packaging Team Date: Sat, 4 Jun 2022 13:30:38 +0000 (+0100) Subject: llvm-runtimes-builtins-build-check X-Git-Tag: archive/raspbian/1%13.0.1-6+rpi1^2~10 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=500a42500c29ad6dd8e2b7a44090110fcdf841ca;p=llvm-toolchain-13.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 d04960fc32..a24c0f6cec 100644 --- a/llvm/runtimes/CMakeLists.txt +++ b/llvm/runtimes/CMakeLists.txt @@ -129,7 +129,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)