From 520ba1b90467cc9839d9cad9a097c0d5600aaff5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Sep 2025 19:23:10 +0300 Subject: [PATCH] gnu: target->hare-arch: Check for system support before target support. This fixes bug #2449. * gnu/packages/hare.scm (target->hare-arch): Only when building on a supported system check if the target is supported by hare. Change-Id: I9bb2bd32a204043ce2702a206598398fbd0541eb --- gnu/packages/hare.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hare.scm b/gnu/packages/hare.scm index 4af08237f5f7d61d4f54d9dbb8050fd9d6bdc7eb..02b884527d9a443e37866a41efa10a20fe501603 100644 --- a/gnu/packages/hare.scm +++ b/gnu/packages/hare.scm @@ -39,10 +39,13 @@ (define* (target->hare-arch #:optional (target (or (%current-target-system) (%current-system)))) - (cond ((target-x86-64? target) "x86_64") - ((target-aarch64? target) "aarch64") - ((target-riscv64? target) "riscv64") - (else (error "unsupported hare target" target)))) + ;; Only error on supported systems, so we don't break guix pull. + (if (member (%current-system) hare-supported-systems) + (cond ((target-x86-64? target) "x86_64") + ((target-aarch64? target) "aarch64") + ((target-riscv64? target) "riscv64") + (else (error "unsupported hare target" target))) + "")) (define (cross-target? target) ; only has to work for supported arches (and target (not (if (%current-target-system)