summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-09-01 14:31:49 +0200
committerLudovic Courtès <ludo@gnu.org>2022-09-01 18:31:26 +0200
commitfe149b01d0b65f421602f8bc794a926434f5d9a9 (patch)
tree1c5935b80ac2148f90bf82040aa5285c768345f4 /etc
parent294db8497c00699a2de5510652b0b8d316fb3a78 (diff)
downloadguix-patches-fe149b01d0b65f421602f8bc794a926434f5d9a9.tar
guix-patches-fe149b01d0b65f421602f8bc794a926434f5d9a9.tar.gz
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'.
Diffstat (limited to 'etc')
-rw-r--r--etc/release-manifest.scm16
1 files changed, 12 insertions, 4 deletions
diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm
index dd70068490..e2be7f0eee 100644
--- a/etc/release-manifest.scm
+++ b/etc/release-manifest.scm
@@ -1,5 +1,5 @@
;;; 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>
;;;
;;; This file is part of GNU Guix.
@@ -26,6 +26,7 @@
((guix platform) #:select (targets))
((gnu services xorg) #:select (%default-xorg-modules))
(guix utils)
+ (guix gexp)
(srfi srfi-1)
(srfi srfi-26))
@@ -142,9 +143,16 @@ TARGET."
(if (target-mingw? target)
%packages-to-cross-build-for-mingw
%packages-to-cross-build)))
- ;; XXX: Important bits like libsigsegv and libffi don't support
- ;; RISCV at the moment, so don't require RISCV support.
- (delete "riscv64-linux-gnu" (targets)))))
+ (fold delete (targets)
+ '(;; Like in (gnu ci), dismiss cross-compilation to x86:
+ ;; 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
(manifest