01/02: gnu: llvm-17: Fix building on riscv64-linux.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 4e26331a5ee87928a16888c36d51e270f0f10f90
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Mar 13 17:30:56 2024 +0200

    gnu: llvm-17: Fix building on riscv64-linux.
    
    * gnu/packages/llvm.scm (%llvm-patches): Add a patch for 17.0.6.
    * gnu/packages/patches/clang-17.0-link-dsymutil-latomic.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
    
    Change-Id: I9dfd23d2f0fb10620c4aa73a6480151d6e6daa9a
---
 gnu/local.mk                                               |  1 +
 gnu/packages/llvm.scm                                      |  3 ++-
 .../patches/clang-17.0-link-dsymutil-latomic.patch         | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 574a67b49c..4750cb290c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1042,6 +1042,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/clang-15.0-libc-search-path.patch       \
   %D%/packages/patches/clang-16.0-libc-search-path.patch       \
   %D%/packages/patches/clang-17.0-libc-search-path.patch       \
+  %D%/packages/patches/clang-17.0-link-dsymutil-latomic.patch  \
   %D%/packages/patches/clang-runtime-asan-build-fixes.patch    \
   %D%/packages/patches/clang-runtime-esan-build-fixes.patch    \
   %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch   \
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index ab30675d5c..2b8e8d6215 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -550,7 +550,8 @@ output), and Binutils.")
   '(("14.0.6" . ("clang-14.0-libc-search-path.patch"))
     ("15.0.7" . ("clang-15.0-libc-search-path.patch"))
     ("16.0.6" . ("clang-16.0-libc-search-path.patch"))
-    ("17.0.6" . ("clang-17.0-libc-search-path.patch"))))
+    ("17.0.6" . ("clang-17.0-libc-search-path.patch"
+                 "clang-17.0-link-dsymutil-latomic.patch"))))
 
 (define (llvm-monorepo version)
   (origin
diff --git a/gnu/packages/patches/clang-17.0-link-dsymutil-latomic.patch 
b/gnu/packages/patches/clang-17.0-link-dsymutil-latomic.patch
new file mode 100644
index 0000000000..f94840527e
--- /dev/null
+++ b/gnu/packages/patches/clang-17.0-link-dsymutil-latomic.patch
@@ -0,0 +1,14 @@
+This was mistakenly added to llvm-17 while a patch was being rebased.
+
+---
+
+diff --git a/llvm/tools/dsymutil/CMakeLists.txt 
b/llvm/tools/dsymutil/CMakeLists.txt
+index 3cb88a50ce25..8699d0bb1d6b 100644
+--- a/llvm/tools/dsymutil/CMakeLists.txt
++++ b/llvm/tools/dsymutil/CMakeLists.txt
+@@ -42,4 +42,4 @@ if(APPLE)
+   target_link_libraries(dsymutil PRIVATE "-framework CoreFoundation")
+ endif(APPLE)
+ 
+-# target_link_libraries(dsymutil PRIVATE ${LLVM_ATOMIC_LIB})
++target_link_libraries(dsymutil PRIVATE ${LLVM_ATOMIC_LIB})