changeset 1279:46e278d09c6b

core/llvm: disable linking to atmic
author David Demelier <markand@malikania.fr>
date Mon, 15 Nov 2021 09:08:29 +0100
parents ab85a4ae04ba
children 52f9fab2a9b3
files core/llvm/llvm.sh core/llvm/patch-disable-atomic.patch
diffstat 2 files changed, 15 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/core/llvm/llvm.sh	Mon Nov 15 09:07:09 2021 +0100
+++ b/core/llvm/llvm.sh	Mon Nov 15 09:08:29 2021 +0100
@@ -117,6 +117,7 @@
 	tar -xvf llvmorg-$PKGVERSION.tar.gz
 	cd llvm-project-llvmorg-$PKGVERSION
 
+	patch -p1 < ../patch-disable-atomic.patch
 	cmake -S llvm -B build \
 		-DCLANG_DEFAULT_CXX_STDLIB=libc++ \
 		-DCLANG_DEFAULT_LINKER=lld \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/llvm/patch-disable-atomic.patch	Mon Nov 15 09:08:29 2021 +0100
@@ -0,0 +1,14 @@
+Disable linking against GNU GCC's libatomic.
+--- a/libcxx/CMakeLists.txt
++++ b/libcxx/CMakeLists.txt
+@@ -797,10 +797,6 @@
+     target_link_libraries(${target} PRIVATE gcc_s)
+   endif()
+ 
+-  if (LIBCXX_HAS_ATOMIC_LIB)
+-    target_link_libraries(${target} PRIVATE atomic)
+-  endif()
+-
+   if (MINGW)
+     target_link_libraries(${target} PRIVATE "${MINGW_LIBRARIES}")
+   endif()