From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Mon, 11 Sep 2023 13:40:42 +0000 (+0100)
Subject: libcxx-libatomic-only-with-gcc-rtlib
X-Git-Tag: archive/raspbian/1%16.0.6-15+rpi1~50
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8d2ba966cefd7f1831a3b96ecdb9041655899a11;p=llvm-toolchain-16.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 f3b2c10ff4..a40f8c7d21 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -765,12 +765,14 @@ 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()
-
-  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)