summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-02-24 15:42:05 +0100
committerLudovic Courtès <ludo@gnu.org>2020-02-24 15:42:05 +0100
commit668a519870237d3472e5724089d570458874e5b5 (patch)
tree8c202ce3e4d8daa4aa6edf6fbd90f853ea06ad2f
parent5afcb5caa53615c0a432e0c1781155398d747218 (diff)
downloadguix-668a519870237d3472e5724089d570458874e5b5.tar.gz
ci: Don't cross build bootstrap tarballs to MinGW.
This makes little sense and it broke in commit
8bd2b15b06f6306e37cc72995b76a7f0754cf1a6 since the mingw libc doesn't
have a "static" output.

* gnu/ci.scm (%packages-to-cross-build): Remove.
(packages-to-cross-build): New procedure.
(hydra-jobs)[cross-jobs]: Use it.
-rw-r--r--gnu/ci.scm10
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm
index 89f499e25f..33c2e84b27 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -121,8 +121,12 @@ SYSTEM."
         %guile-bootstrap-tarball
         %bootstrap-tarballs))
 
-(define %packages-to-cross-build
-  %core-packages)
+(define (packages-to-cross-build target)
+  "Return the list of packages to cross-build for TARGET."
+  ;; Don't cross-build the bootstrap tarballs for MinGW.
+  (if (string-contains target "mingw")
+      (drop-right %core-packages 6)
+      %core-packages))
 
 (define %cross-targets
   '("mips64el-linux-gnu"
@@ -455,7 +459,7 @@ Return #f if no such checkout is found."
                   (map (lambda (package)
                          (package-cross-job store (job-name package)
                                             package target system))
-                       %packages-to-cross-build))
+                       (packages-to-cross-build target)))
                 (remove (either from-32-to-64? same? pointless?)
                         %cross-targets)))