From ec4e455998dfa8bf67666e41a73d4a2ac6447646 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 14 Jul 2024 18:55:20 +0200 Subject: [PATCH] rebase of the patch --- .../llvm-runtimes-builtins-build-check.diff | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/debian/patches/llvm-runtimes-builtins-build-check.diff b/debian/patches/llvm-runtimes-builtins-build-check.diff index ad3ea911..cc84b038 100644 --- a/debian/patches/llvm-runtimes-builtins-build-check.diff +++ b/debian/patches/llvm-runtimes-builtins-build-check.diff @@ -1,10 +1,10 @@ add a check and only set up and build compiler-rt builtins if they have not been disabled -Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240714063407+a72eed7a238b/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt -@@ -137,7 +137,12 @@ endfunction() +--- llvm-toolchain-snapshot_19~++20240714063407+a72eed7a238b.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240714063407+a72eed7a238b/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) @@ -15,6 +15,10 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CM + 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) + # 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()