diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-08-01 14:44:45 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-08-11 10:48:13 +0100 |
| commit | 5f0dcf22a384af08f1e7d5aafff340f3f808b55b (patch) | |
| tree | e231e847b353343e35b709d62386897c8fc2258a /gnu/packages | |
| parent | 8b943673a15a337c48c71cecad18d9eb68143d95 (diff) | |
| download | guix-5f0dcf22a384af08f1e7d5aafff340f3f808b55b.tar.gz guix-5f0dcf22a384af08f1e7d5aafff340f3f808b55b.zip | |
gnu: llvm: Fix misc errors for unsupported targets.
* 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
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/llvm.scm | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 2614a403c1..0c0ec1bca1 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -78,6 +78,8 @@ #: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 @@ as \"x86_64-linux\"." (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 @@ output), and Binutils.") ;; 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 @@ of programming tools as well as libraries with equivalent functionality.") ;; 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?) |