summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2024-04-17 17:27:30 +0200
committerLudovic Courtès <ludo@gnu.org>2024-04-17 17:29:58 +0200
commit7bed290fdfd830d690daf065de6d2ecab73309d9 (patch)
tree38244ec69a67a020a928947f11957ebf7a49eaab
parent858c40ced444a5a1eb758b0387e04754850309a7 (diff)
downloadguix-patches-7bed290fdfd830d690daf065de6d2ecab73309d9.tar
guix-patches-7bed290fdfd830d690daf065de6d2ecab73309d9.tar.gz
ci: Don’t cross-compile to xtensa-ath9k-elf.
This is a followup to 9a60894156c3ea2c609ae0cd787df949f2d6ecc2. * gnu/ci.scm (%bare-platform-triplets): New variable. (cross-jobs)[pointless?]: Use it. Change-Id: I4701bc402bb93d372d46b7208697e0f998a1dc62
-rw-r--r--gnu/ci.scm12
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm
index e25a772772..5d208a8e83 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
@@ -169,6 +169,13 @@ SYSTEM."
(drop-right %core-packages 6)
%core-packages))
+(define %bare-platform-triplets
+ ;; Cross-compilation triplets of platforms that lack a proper user-space and
+ ;; for which there's no point in trying to build regular packages.
+ '("avr"
+ "or1k-elf"
+ "xtensa-ath9k-elf"))
+
(define (cross-jobs store system)
"Return a list of cross-compilation jobs for SYSTEM."
(define (from-32-to-64? target)
@@ -190,8 +197,7 @@ SYSTEM."
(define (pointless? target)
;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM.
- (or (string=? target "avr") ; Nothing for AVR at this time.
- (string=? target "or1k-elf") ;; Nothing for or1k-elf at this time.
+ (or (member target %bare-platform-triplets)
(match system
((or "x86_64-linux" "i686-linux")
(if (string-contains target "mingw")