amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: llvm-for-mesa: Build all targets.

Browse source 
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
This commit is contained in:
John Kehayias 2024-09-01 20:54:06 -04:00
parent 6ebb5ecafc
commit edf097aad5
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/llvm.scm
View file

@ -22,7 +22,7 @@
;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net> ;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022, 2024 Greg Hogan <code@greghogan.com> ;;; Copyright © 2022, 2024 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022, 2024 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2022 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
@ -2172,21 +2172,18 @@ using @code{clang-rename}.")))
,@modules)) ,@modules))
((#:configure-flags cf ''()) ((#:configure-flags cf ''())
#~(cons* #~(cons*
;; AMDGPU is needed by the vulkan drivers. #$@(if (%current-target-system)
#$(string-append "-DLLVM_TARGETS_TO_BUILD=" '("-DBUILD_SHARED_LIBS:BOOL=TRUE"
(system->llvm-target) ";AMDGPU") "-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. ;; Skipping tools and utils decreases the output by ~100 MiB.
"-DLLVM_BUILD_TOOLS=NO" "-DLLVM_BUILD_TOOLS=NO"
(remove (remove
(cut string-match (cut string-match
#$(if (%current-target-system) #$(if (%current-target-system)
"-DLLVM_(LINK_LLVM_DYLIB|TARGETS_TO_BUILD|INSTALL_UTILS).*" "-DLLVM_(LINK_LLVM_DYLIB|INSTALL_UTILS).*"
"-DLLVM_(TARGETS_TO_BUILD|INSTALL_UTILS).*") <>) "-DLLVM_INSTALL_UTILS.*") <>)
#$cf))) #$cf)))
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
#~(modify-phases #$phases #~(modify-phases #$phases
#$@(if (%current-target-system) #$@(if (%current-target-system)