From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Fri, 14 Mar 2025 09:48:31 +0000 (+0100)
Subject: libcxx-libatomic-only-with-gcc-rtlib
X-Git-Tag: archive/raspbian/1%19.1.7-3+rpi1^2~51
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=afc4f4b66754826545b420a7bb34b3eac66b7bb5;p=llvm-toolchain-19.git

libcxx-libatomic-only-with-gcc-rtlib

if libatomic is found only link it if libgcc is the rtlib

Gbp-Pq: Topic libcxx
Gbp-Pq: Name libcxx-libatomic-only-with-gcc-rtlib.diff
---

diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 674082c7d1..bfef908c07 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -693,13 +693,16 @@ function(cxx_link_system_libraries target)
       endif()
     elseif (LIBCXX_HAS_GCC_LIB)
       target_link_libraries(${target} PRIVATE gcc)
+      if (LIBCXX_HAS_ATOMIC_LIB)
+        target_link_libraries(${target} PRIVATE atomic)
+      endif()
     elseif (LIBCXX_HAS_GCC_S_LIB)
       target_link_libraries(${target} PRIVATE gcc_s)
     endif()
-  endif()
 
-  if (LIBCXX_HAS_ATOMIC_LIB)
-    target_link_libraries(${target} PRIVATE atomic)
+    if (LIBCXX_HAS_ATOMIC_LIB)
+      target_link_libraries(${target} PRIVATE atomic)
+    endif()
   endif()
 
   if (MINGW)