summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-04-04 17:35:02 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-04 18:52:35 +0200
commitd8c8bfcc1f7c2e8226abebc6227261c8617f90d0 (patch)
tree35b1bd04a527f6e9d1e01c7c9a9c67f585738279
parent3a3b594822c8b63faccd01b9a85482de9cc07211 (diff)
downloadguix-d8c8bfcc1f7c2e8226abebc6227261c8617f90d0.tar.gz
maint: Remove unsupported cross-compilation jobs from 'release-manifest.scm'.
* etc/release-manifest.scm (%packages-to-cross-build-for-mingw): New
variable.
(%cross-manifest): Use it.  Remove "riscv64-linux-gnu" from %CROSS-TARGETS.
-rw-r--r--etc/release-manifest.scm13
1 files changed, 11 insertions, 2 deletions
diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm
index 67b92c3921..327d3e4cc5 100644
--- a/etc/release-manifest.scm
+++ b/etc/release-manifest.scm
@@ -23,6 +23,7 @@
              (guix packages)
              (guix profiles)
              ((gnu ci) #:select (%cross-targets))
+             (guix utils)
              (srfi srfi-1)
              (srfi srfi-26))
 
@@ -67,6 +68,10 @@ TARGET."
                "gawk" "gettext" "gzip" "xz"
                "hello" "guile@2.2" "zlib"))))
 
+(define %packages-to-cross-build-for-mingw
+  ;; Many things don't build for MinGW.  Restrict to what's known to work.
+  (map specification->package '("hello")))
+
 (define %cross-bootstrap-targets
   ;; Cross-compilation triplets for which 'bootstrap-tarballs' must be
   ;; buildable.
@@ -91,8 +96,12 @@ TARGET."
    (append-map (lambda (target)
                  (map (cut package->manifest-entry* <> "x86_64-linux"
                            #:target target)
-                      %packages-to-cross-build))
-               %cross-targets)))
+                      (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" %cross-targets))))
 
 (define %cross-bootstrap-manifest
   (manifest