From 30b7771ef94145a50d42d76592ec984988b6585a Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Fri, 14 Mar 2025 10:48:31 +0100 Subject: [PATCH] libcxxabi-fix-link-builtins if LIBCXXABI_USE_COMPILER_RT=ON, add builtins to libcxxabi library flags, otherwise add libgcc following how libunwind does the same Gbp-Pq: Topic libcxx Gbp-Pq: Name libcxxabi-fix-link-builtins.diff --- libcxxabi/src/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index 1e06b8cbf0..e11df752a1 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/src/CMakeLists.txt @@ -75,7 +75,9 @@ if (NOT APPLE) # On Apple platforms, we always use -nostdlib++ so we don't need add_library_flags_if(LIBCXXABI_HAS_C_LIB c) endif() -if (NOT LIBCXXABI_USE_COMPILER_RT) +if (LIBCXXABI_USE_COMPILER_RT) + add_library_flags("${LIBCXXABI_BUILTINS_LIBRARY}") +else() add_library_flags_if(LIBCXXABI_HAS_GCC_LIB gcc) endif() if (NOT LIBCXXABI_USE_LLVM_UNWINDER) -- 2.30.2