From d8c8bfcc1f7c2e8226abebc6227261c8617f90d0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 4 Apr 2020 17:35:02 +0200 Subject: 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. --- etc/release-manifest.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'etc') 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 @@ (define %packages-to-cross-build "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 @@ (define %cross-manifest (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 -- cgit v1.2.3