From 2e707e019644f267ba25728376f8b3e1701f391f Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Fri, 14 Mar 2025 10:48:31 +0100 Subject: [PATCH] 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 --- llvm/runtimes/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt index 1dd9b84687..09eb468b24 100644 --- a/llvm/runtimes/CMakeLists.txt +++ b/llvm/runtimes/CMakeLists.txt @@ -142,10 +142,15 @@ 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 the user did not specify the targets infer them from the runtimes. set(builtin_targets ${LLVM_BUILTIN_TARGETS}) - if(NOT builtin_targets) + if(NOT LLVM_BUILTIN_TARGETS) if("compiler-rt" IN_LIST LLVM_ENABLE_RUNTIMES) list(APPEND builtin_targets "default") endif() -- 2.30.2