mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-07-29 01:49:08 +00:00
rebase of the patch
This commit is contained in:
parent
6687fb0527
commit
35c0ede504
@ -1,19 +1,20 @@
|
|||||||
if libatomic is found only link it if libgcc is the rtlib
|
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_18~++20231213094656+c02d07fdf007.orig/libcxx/CMakeLists.txt
|
||||||
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/CMakeLists.txt
|
+++ llvm-toolchain-snapshot_18~++20231213094656+c02d07fdf007/libcxx/CMakeLists.txt
|
||||||
@@ -707,12 +707,14 @@ function(cxx_link_system_libraries targe
|
@@ -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()
|
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)
|
- if (LIBCXX_HAS_ATOMIC_LIB)
|
||||||
- target_link_libraries(${target} PRIVATE atomic)
|
- target_link_libraries(${target} PRIVATE atomic)
|
||||||
+ if (LIBCXX_HAS_ATOMIC_LIB)
|
+ if (LIBCXX_HAS_ATOMIC_LIB)
|
||||||
|
Loading…
Reference in New Issue
Block a user