mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
ci: Don’t cross-compile to xtensa-ath9k-elf.
This is a followup to 9a60894156
.
* gnu/ci.scm (%bare-platform-triplets): New variable.
(cross-jobs)[pointless?]: Use it.
Change-Id: I4701bc402bb93d372d46b7208697e0f998a1dc62
This commit is contained in:
parent
858c40ced4
commit
7bed290fdf
1 changed files with 9 additions and 3 deletions
12
gnu/ci.scm
12
gnu/ci.scm
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; 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 © 2017, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||||
;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org>
|
;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org>
|
||||||
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
|
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
|
||||||
|
@ -169,6 +169,13 @@ (define (packages-to-cross-build target)
|
||||||
(drop-right %core-packages 6)
|
(drop-right %core-packages 6)
|
||||||
%core-packages))
|
%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)
|
(define (cross-jobs store system)
|
||||||
"Return a list of cross-compilation jobs for SYSTEM."
|
"Return a list of cross-compilation jobs for SYSTEM."
|
||||||
(define (from-32-to-64? target)
|
(define (from-32-to-64? target)
|
||||||
|
@ -190,8 +197,7 @@ (define (same? target)
|
||||||
|
|
||||||
(define (pointless? target)
|
(define (pointless? target)
|
||||||
;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM.
|
;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM.
|
||||||
(or (string=? target "avr") ; Nothing for AVR at this time.
|
(or (member target %bare-platform-triplets)
|
||||||
(string=? target "or1k-elf") ;; Nothing for or1k-elf at this time.
|
|
||||||
(match system
|
(match system
|
||||||
((or "x86_64-linux" "i686-linux")
|
((or "x86_64-linux" "i686-linux")
|
||||||
(if (string-contains target "mingw")
|
(if (string-contains target "mingw")
|
||||||
|
|
Loading…
Reference in a new issue