Subject: [bug#73071] [PATCH mesa-updates 7/8] gnu: llvm-for-mesa: Build all targets.

From: John Kehayias <[email-masked]>
Date: Fri, 06 Sep 2024 15:07:59 +0000

This change is needed for updating mesa to 24.2.1.  Otherwise, mesa fails to
build.  For example, linking intel_clc fails with errors of libclang-cpp.so
having undefined references to various LLVM targets.

It is possible that just some LLVM targets could be built or a modified
version of the clang input for mesa (now required) could be used to try to
reduce the closure size as before.

* gnu/packages/llvm.scm (llvm-for-mesa)[arguments]: Don't set the
LLVM_TARGETS_TO_BUILD configure flag.  Also, don't remove it from the
inherited configure-flags.  Fix indentation.

Change-Id: I4a2b7239e6ea77b0d3bce10bdf945691faa84994
---
 gnu/packages/llvm.scm | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 7fcb15891d..800fe29599 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -22,7 +22,7 @@
 ;;; Copyright © 2021 Lars-Dominik Braun <[email-masked]>
 ;;; Copyright © 2021, 2022 Guillaume Le Vaillant <[email-masked]>
 ;;; Copyright © 2022, 2024 Greg Hogan <[email-masked]>
-;;; Copyright © 2022 John Kehayias <[email-masked]>
+;;; Copyright © 2022, 2024 John Kehayias <[email-masked]>
 ;;; Copyright © 2022 Clément Lassieur <[email-masked]>
 ;;; Copyright © 2022 Zhu Zihao <[email-masked]>
 ;;; Copyright © 2023 Hilton Chain <[email-masked]>
@@ -2166,21 +2166,18 @@ (define-public llvm-for-mesa
             ,@modules))
          ((#:configure-flags cf ''())
           #~(cons*
-              ;; AMDGPU is needed by the vulkan drivers.
-              #$(string-append "-DLLVM_TARGETS_TO_BUILD="
-                               (system->llvm-target) ";AMDGPU")
-              #$@(if (%current-target-system)
-                     '("-DBUILD_SHARED_LIBS:BOOL=TRUE"
-                       "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE")
+             #$@(if (%current-target-system)
+                    '("-DBUILD_SHARED_LIBS:BOOL=TRUE"
+                      "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE")
                     '())
-              ;; Skipping tools and utils decreases the output by ~100 MiB.
-              "-DLLVM_BUILD_TOOLS=NO"
-              (remove
-               (cut string-match
-                    #$(if (%current-target-system)
-                          "-DLLVM_(LINK_LLVM_DYLIB|TARGETS_TO_BUILD|INSTALL_UTILS).*"
-                          "-DLLVM_(TARGETS_TO_BUILD|INSTALL_UTILS).*") <>)
-                      #$cf)))
+             ;; Skipping tools and utils decreases the output by ~100 MiB.
+             "-DLLVM_BUILD_TOOLS=NO"
+             (remove
+              (cut string-match
+                   #$(if (%current-target-system)
+                         "-DLLVM_(LINK_LLVM_DYLIB|INSTALL_UTILS).*"
+                         "-DLLVM_INSTALL_UTILS.*") <>)
+              #$cf)))
          ((#:phases phases '%standard-phases)
           #~(modify-phases #$phases
               #$@(if (%current-target-system)
--
2.45.2