[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/10: hydra: Add "i686-w64-mingw32" as a cross-compilation target.
From: |
Ludovic Courtès |
Subject: |
10/10: hydra: Add "i686-w64-mingw32" as a cross-compilation target. |
Date: |
Wed, 7 Dec 2016 09:23:37 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit dea91108cf6b9bb46071c8f65c9abf834c5b064d
Author: Ludovic Courtès <address@hidden>
Date: Wed Dec 7 10:21:00 2016 +0100
hydra: Add "i686-w64-mingw32" as a cross-compilation target.
* build-aux/hydra/gnu-system.scm (%cross-targets): Add "i686-w64-mingw32".
(hydra-jobs)[cross-jobs?](pointless?): New procedure.
Use it.
---
build-aux/hydra/gnu-system.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 26c7b3c..2fe42a3 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -123,7 +123,8 @@ SYSTEM."
(define %cross-targets
'("mips64el-linux-gnu"
"mips64el-linux-gnuabi64"
- "arm-linux-gnueabihf"))
+ "arm-linux-gnueabihf"
+ "i686-w64-mingw32"))
(define (demo-os)
"Return the \"demo\" 'operating-system' structure."
@@ -278,6 +279,11 @@ valid."
;; 'mips64el-linux'.
(string-contains target system))
+ (define (pointless? target)
+ ;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM.
+ (and (string-contains target "mingw")
+ (not (string=? "x86_64-linux" system))))
+
(define (either proc1 proc2)
(lambda (x)
(or (proc1 x) (proc2 x))))
@@ -287,7 +293,8 @@ valid."
(package-cross-job store (job-name package)
package target system))
%packages-to-cross-build))
- (remove (either from-32-to-64? same?) %cross-targets)))
+ (remove (either from-32-to-64? same? pointless?)
+ %cross-targets)))
;; Turn off grafts. Grafting is meant to happen on the user's machines.
(parameterize ((%graft? #f))
- branch master updated (4908ae4 -> dea9110), Ludovic Courtès, 2016/12/07
- 05/10: gnu: libunistring: support mingw: propagate libiconv if needed., Ludovic Courtès, 2016/12/07
- 10/10: hydra: Add "i686-w64-mingw32" as a cross-compilation target.,
Ludovic Courtès <=
- 04/10: gnu: Add function libiconv-if-needed., Ludovic Courtès, 2016/12/07
- 01/10: doc: Correct example for 'wpa-supplicant-service-type'., Ludovic Courtès, 2016/12/07
- 06/10: gnu: gmp: build shared library for mingw., Ludovic Courtès, 2016/12/07
- 09/10: gnu: guile-2.0: support mingw., Ludovic Courtès, 2016/12/07
- 08/10: gnu: readline: support mingw., Ludovic Courtès, 2016/12/07
- 07/10: gnu: ncurses: support mingw., Ludovic Courtès, 2016/12/07
- 03/10: gnu: cross-base: Add i686-w64-mingw32 target., Ludovic Courtès, 2016/12/07
- 02/10: gnu: Add mingw-w64., Ludovic Courtès, 2016/12/07