diff options
| author | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-08-09 22:07:05 +0800 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-08-14 10:56:52 +0100 |
| commit | e320ed57204363625dc1eb1e393f8535020087e0 (patch) | |
| tree | 4d887f644251e077295c015153a2956aa24db653 /gnu/packages | |
| parent | ff185dc00319af1dede83df465288e73dc0e5ff5 (diff) | |
| download | guix-e320ed57204363625dc1eb1e393f8535020087e0.tar.gz guix-e320ed57204363625dc1eb1e393f8535020087e0.zip | |
gnu: cpu-features: Fix cross-compilation.
* gnu/packages/assembly.scm (cpu-features)[arguments]<#:configure-flags>: When
cross-compilation, set CMAKE_SYSTEM_PROCESSOR.
Change-Id: I8b6f9bdeac66b85ab273f81a320e4b8e0d69b5d0
Signed-off-by: Christopher Baines <mail@cbaines.net>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/assembly.scm | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index b7ccb153d3..5b2518277c 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2022 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2023 Simon South <simon@simonsouth.net> ;;; Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -664,7 +665,24 @@ files.") #:tests? #f #:configure-flags #~(list "-DBUILD_TESTING=off" ;; XXX: insists on using bundled googletest - "-DBUILD_SHARED_LIBS=ON"))) + "-DBUILD_SHARED_LIBS=ON" + #$@(let ((target (%current-target-system))) + (if target + (cond ((string-prefix? "arm" target) + '("-DCMAKE_SYSTEM_PROCESSOR=arm")) + ((string-prefix? "aarch64" target) + '("-DCMAKE_SYSTEM_PROCESSOR=aarch64")) + ((string-prefix? "i686" target) + '("-DCMAKE_SYSTEM_PROCESSOR=x86")) + ((string-prefix? "x86_64" target) + '("-DCMAKE_SYSTEM_PROCESSOR=x86_64")) + ;; 32-bit and 64-bit + ((string-prefix? "powerpc" target) + '("-DCMAKE_SYSTEM_PROCESSOR=powerpc")) + ((string-prefix? "riscv64" target) + '("-DCMAKE_SYSTEM_PROCESSOR=riscv64")) + (else '())) + '()))))) (home-page "https://github.com/google/cpu_features") (synopsis "Cross platform C99 library to get cpu features at runtime") (description |