From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sat, 4 Jan 2025 08:12:52 +0000 (+0100)
Subject: libcxxabi-fix-link-builtins
X-Git-Tag: archive/raspbian/1%17.0.6-20+rpi1^2~54
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=65764f11d1227b8eada11b7ea01a3d581f347d34;p=llvm-toolchain-17.git

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
---

diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
index 54002bafa0..3934c8aeeb 100644
--- a/libcxxabi/src/CMakeLists.txt
+++ b/libcxxabi/src/CMakeLists.txt
@@ -77,7 +77,9 @@ else()
   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)