diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2024-09-01 20:54:06 -0400 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-11-05 11:56:28 -0500 |
| commit | edf097aad5ce3c156dc769a149c0c692a7697f94 (patch) | |
| tree | f2bbf60328693419b4a98a7846c948482bacc8a3 | |
| parent | 6ebb5ecafc6818c589d8960760abd20344c0a699 (diff) | |
| download | guix-edf097aad5ce3c156dc769a149c0c692a7697f94.tar.gz guix-edf097aad5ce3c156dc769a149c0c692a7697f94.zip | |
gnu: llvm-for-mesa: Build all targets.
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
| -rw-r--r-- | gnu/packages/llvm.scm | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 5333e1c3aa..c6566a3339 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net> ;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net> ;;; 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 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> @@ -2172,21 +2172,18 @@ using @code{clang-rename}."))) ,@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) |