From e320ed57204363625dc1eb1e393f8535020087e0 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Fri, 9 Aug 2024 22:07:05 +0800 Subject: [PATCH] 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 --- gnu/packages/assembly.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) 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 ;;; Copyright © 2023 Simon South ;;; Copyright © 2023 B. Wilson +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -664,7 +665,24 @@ (define-public cpu-features #: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