From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sat, 5 Apr 2025 20:24:44 +0000 (+0200)
Subject: libcxx-libatomic-only-with-gcc-rtlib
X-Git-Tag: archive/raspbian/1%18.1.8-18+rpi1^2~54
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=787dab786d2ac3d98f05b6410087836557bb22aa;p=llvm-toolchain-18.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 d392e95077..329f9e4542 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -691,13 +691,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)