From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sun, 13 Feb 2022 13:04:40 +0000 (+0000)
Subject: libcxx-libatomic-only-with-gcc-rtlib
X-Git-Tag: archive/raspbian/1%12.0.1-20+rpi1^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3225f6a413aca5c277a6e407686d14fa8420f841;p=llvm-toolchain-12.git

libcxx-libatomic-only-with-gcc-rtlib

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

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

diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index cdd5495e36..7793222a2c 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -756,12 +756,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)