diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2024-04-17 17:27:30 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-04-17 17:29:58 +0200 |
| commit | 7bed290fdfd830d690daf065de6d2ecab73309d9 (patch) | |
| tree | 38244ec69a67a020a928947f11957ebf7a49eaab /gnu/ci.scm | |
| parent | 858c40ced444a5a1eb758b0387e04754850309a7 (diff) | |
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
Diffstat (limited to 'gnu/ci.scm')
| -rw-r--r-- | gnu/ci.scm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm index e25a772772a..5d208a8e832 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 3 | ;;; Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> |
| 4 | ;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org> | 4 | ;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org> |
| 5 | ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu> | 5 | ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu> |
| @@ -169,6 +169,13 @@ SYSTEM." | |||
| 169 | (drop-right %core-packages 6) | 169 | (drop-right %core-packages 6) |
| 170 | %core-packages)) | 170 | %core-packages)) |
| 171 | 171 | ||
| 172 | (define %bare-platform-triplets | ||
| 173 | ;; Cross-compilation triplets of platforms that lack a proper user-space and | ||
| 174 | ;; for which there's no point in trying to build regular packages. | ||
| 175 | '("avr" | ||
| 176 | "or1k-elf" | ||
| 177 | "xtensa-ath9k-elf")) | ||
| 178 | |||
| 172 | (define (cross-jobs store system) | 179 | (define (cross-jobs store system) |
| 173 | "Return a list of cross-compilation jobs for SYSTEM." | 180 | "Return a list of cross-compilation jobs for SYSTEM." |
| 174 | (define (from-32-to-64? target) | 181 | (define (from-32-to-64? target) |
| @@ -190,8 +197,7 @@ SYSTEM." | |||
| 190 | 197 | ||
| 191 | (define (pointless? target) | 198 | (define (pointless? target) |
| 192 | ;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM. | 199 | ;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM. |
| 193 | (or (string=? target "avr") ; Nothing for AVR at this time. | 200 | (or (member target %bare-platform-triplets) |
| 194 | (string=? target "or1k-elf") ;; Nothing for or1k-elf at this time. | ||
| 195 | (match system | 201 | (match system |
| 196 | ((or "x86_64-linux" "i686-linux") | 202 | ((or "x86_64-linux" "i686-linux") |
| 197 | (if (string-contains target "mingw") | 203 | (if (string-contains target "mingw") |
