maint: Ignore cross-compilation to x86.

This is consistent with what's done by 'cross-jobs' in (gnu ci).

* etc/release-manifest.scm (%cross-manifest): Remove "x86_64-linux-gnu"
and "i686-linux-gnu" from the list returned by 'targets'.
This commit is contained in:
Ludovic Courtès 2022-09-01 14:31:49 +02:00
parent 294db8497c
commit fe149b01d0
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5

View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -26,6 +26,7 @@
((guix platform) #:select (targets)) ((guix platform) #:select (targets))
((gnu services xorg) #:select (%default-xorg-modules)) ((gnu services xorg) #:select (%default-xorg-modules))
(guix utils) (guix utils)
(guix gexp)
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26)) (srfi srfi-26))
@ -142,9 +143,16 @@ TARGET."
(if (target-mingw? target) (if (target-mingw? target)
%packages-to-cross-build-for-mingw %packages-to-cross-build-for-mingw
%packages-to-cross-build))) %packages-to-cross-build)))
;; XXX: Important bits like libsigsegv and libffi don't support (fold delete (targets)
;; RISCV at the moment, so don't require RISCV support. '(;; Like in (gnu ci), dismiss cross-compilation to x86:
(delete "riscv64-linux-gnu" (targets))))) ;; it's pointless.
"x86_64-linux-gnu"
"i686-linux-gnu"
;; XXX: Important bits like libsigsegv and libffi don't
;; support RISCV at the moment, so don't require RISCV
;; support.
"riscv64-linux-gnu")))))
(define %cross-bootstrap-manifest (define %cross-bootstrap-manifest
(manifest (manifest