mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-07 11:29:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: llvm-16: Rewrite using make-llvm.

Browse source 
* gnu/packages/llvm.scm (make-llvm)[arguments]: Adjust configure-flags
and phases for llvm version 16 and higher.
(llvm-16): Rewrite using make-llvm.

Change-Id: Ia79cd90d1219fc6210090a724595b3df04a097d7
This commit is contained in:
Efraim Flashner 2025-01-26 16:08:12 +02:00
parent deb3562384
commit ba1d16b1b2
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 12 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gnu/packages/llvm.scm
View file

@ -616,6 +616,11 @@ output), and Binutils.")
#~((string-append "-DLLVM_TABLEGEN=" #~((string-append "-DLLVM_TABLEGEN="
#+(file-append this-package #+(file-append this-package
"/bin/llvm-tblgen")) "/bin/llvm-tblgen"))
#$@(if (version>=? version "16.0")
#~((string-append
"-DLLVM_NATIVE_TOOL_DIR="
#+(file-append this-package "/bin")))
#~())
#$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE=" #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE="
(%current-target-system)) (%current-target-system))
#$(string-append "-DLLVM_TARGET_ARCH=" llvm-target-arch) #$(string-append "-DLLVM_TARGET_ARCH=" llvm-target-arch)
@ -648,7 +653,12 @@ output), and Binutils.")
"/share"))) "/share")))
(mkdir-p opt-viewer-share) (mkdir-p opt-viewer-share)
(rename-file (string-append #$output "/share/opt-viewer") (rename-file (string-append #$output "/share/opt-viewer")
opt-viewer-share))))))) opt-viewer-share))))
;; The build daemon goes OOM on i686-linux on this phase.
#$@(if (and (version>=? version "16.0")
(target-x86-32?))
#~((delete 'make-dynamic-linker-cache))
#~()))))
(native-inputs (list python-wrapper perl)) (native-inputs (list python-wrapper perl))
(inputs (list libffi)) (inputs (list libffi))
(propagated-inputs (list zlib)) ;to use output from llvm-config (propagated-inputs (list zlib)) ;to use output from llvm-config
@ -1432,40 +1442,7 @@ Library.")
#:patches '("clang-3.5-libc-search-path.patch"))) #:patches '("clang-3.5-libc-search-path.patch")))
(define-public llvm-16 (define-public llvm-16
(package (make-llvm "16.0.6"))
(inherit llvm-15)
(version "16.0.6")
(source (llvm-monorepo version))
(arguments
(substitute-keyword-arguments (package-arguments llvm-15)
((#:modules modules '((guix build cmake-build-system)
(guix build utils)))
(if (%current-target-system)
`((ice-9 regex)
(srfi srfi-1)
(srfi srfi-26)
,@modules)
modules))
((#:configure-flags cf #~'())
(if (%current-target-system)
;; Use a newer version of llvm-tblgen and add the new
;; configure-flag needed for cross-building.
#~(cons* (string-append "-DLLVM_TABLEGEN="
#+(file-append this-package
"/bin/llvm-tblgen"))
(string-append "-DLLVM_NATIVE_TOOL_DIR="
#+(file-append this-package "/bin"))
(remove
(cut string-match
"-DLLVM_TABLEGEN.*" <>)
#$cf))
cf))
;; The build daemon goes OOM on i686-linux on this phase.
((#:phases phases #~'%standard-phases)
(if (target-x86-32?)
#~(modify-phases #$phases
(delete 'make-dynamic-linker-cache))
phases))))))
(define-public clang-runtime-16 (define-public clang-runtime-16
(clang-runtime-from-llvm llvm-16)) (clang-runtime-from-llvm llvm-16))