From 35c0ede504fa776f375916c3585653443c90b72b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 13 Dec 2023 21:56:20 +0100 Subject: [PATCH] rebase of the patch --- .../libcxx-libatomic-only-with-gcc-rtlib.diff | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff b/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff index 8020fdef..b750c4f0 100644 --- a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff +++ b/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff @@ -1,19 +1,20 @@ if libatomic is found only link it if libgcc is the rtlib -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20231213094656+c02d07fdf007/libcxx/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxx/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/CMakeLists.txt -@@ -707,12 +707,14 @@ function(cxx_link_system_libraries targe +--- llvm-toolchain-snapshot_18~++20231213094656+c02d07fdf007.orig/libcxx/CMakeLists.txt ++++ llvm-toolchain-snapshot_18~++20231213094656+c02d07fdf007/libcxx/CMakeLists.txt +@@ -685,13 +685,16 @@ function(cxx_link_system_libraries targe + 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() - 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)