@@ 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