ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: llvm: Fix misc errors for unsupported targets.

Browse source 
* gnu/packages/llvm.scm (system->llvm-target-arch): Return #f for unknown
targets.
(llvm-15, llvm-14): Handle system->llvm-target-arch and raise a
package-unsupported-target-error condition.

Change-Id: I647f721a64a39bb34196998b7e4adda3a25f1ab3
This commit is contained in:
Christopher Baines 2024-08-01 14:44:45 +01:00
parent 8b943673a1
commit 5f0dcf22a3
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gnu/packages/llvm.scm
View file

@ -78,6 +78,8 @@ (define-module (gnu packages llvm)
#:use-module (gnu packages vulkan)
#:use-module (gnu packages xml)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
#:use-module (ice-9 match)
#:export (make-lld-wrapper
system->llvm-target))
@ -107,8 +109,7 @@ (define* (system->llvm-target-arch #:optional
(if (string-prefix? system-prefix system)
target
(matches rest ...)))
((_)
(error "LLVM target arch for system is unknown" system)))))
((_) #f))))
(matches ("aarch64" => "AArch64")
("armhf" => "ARM")
("mips64el" => "Mips")
@ -591,15 +592,21 @@ (define-public llvm-15
;; These options are required for cross-compiling LLVM according
;; to <https://llvm.org/docs/HowToCrossCompileLLVM.html>.
#$@(if (%current-target-system)
#~((string-append "-DLLVM_TABLEGEN="
(or (and=>
(system->llvm-target-arch)
(lambda (llvm-target-arch)
#~((string-append "-DLLVM_TABLEGEN="
#+(file-append this-package
"/bin/llvm-tblgen"))
#$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE="
(%current-target-system))
#$(string-append "-DLLVM_TARGET_ARCH="
(system->llvm-target-arch))
#$(string-append "-DLLVM_TARGETS_TO_BUILD="
(system->llvm-target)))
#$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE="
(%current-target-system))
#$(string-append "-DLLVM_TARGET_ARCH=" llvm-target-arch)
#$(string-append "-DLLVM_TARGETS_TO_BUILD="
(system->llvm-target)))))
(raise (condition
(&package-unsupported-target-error
(package this-package)
(target (%current-target-system))))))
'())
;; Note: sadly, the build system refuses the use of
;; -DBUILD_SHARED_LIBS=ON and the large static archives are needed to
@ -651,15 +658,21 @@ (define-public llvm-14
;; These options are required for cross-compiling LLVM according
;; to <https://llvm.org/docs/HowToCrossCompileLLVM.html>.
#$@(if (%current-target-system)
#~((string-append "-DLLVM_TABLEGEN="
#+(file-append this-package
"/bin/llvm-tblgen"))
#$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE="
(%current-target-system))
#$(string-append "-DLLVM_TARGET_ARCH="
(system->llvm-target-arch))
#$(string-append "-DLLVM_TARGETS_TO_BUILD="
(system->llvm-target)))
(or (and=>
(system->llvm-target-arch)
(lambda (llvm-target-arch)
#~((string-append "-DLLVM_TABLEGEN="
#+(file-append this-package
"/bin/llvm-tblgen"))
#$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE="
(%current-target-system))
#$(string-append "-DLLVM_TARGET_ARCH=" llvm-target-arch)
#$(string-append "-DLLVM_TARGETS_TO_BUILD="
(system->llvm-target)))))
(raise (condition
(&package-unsupported-target-error
(package this-package)
(target (%current-target-system))))))
'())
;; undefined reference to `__atomic_fetch_add_8' in lib/libLLVMOrcJIT.so.14
#$@(if (target-ppc32?)