From 394137aca41c7bcddb007b0b29c58b3868006424 Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Tue, 30 Nov 2021 18:32:51 +0000 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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt index 51cef7107d..cafc31d013 100644 --- a/llvm/runtimes/CMakeLists.txt +++ b/llvm/runtimes/CMakeLists.txt @@ -131,7 +131,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) -- 2.30.2