nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2016-12-07 10:21:00 +01:00
parent 88da729ff7
commit dea91108cf
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build-aux/hydra/gnu-system.scm
View File

@ -123,7 +123,8 @@ SYSTEM."
(define %cross-targets (define %cross-targets
'("mips64el-linux-gnu" '("mips64el-linux-gnu"
"mips64el-linux-gnuabi64" "mips64el-linux-gnuabi64"
"arm-linux-gnueabihf")) "arm-linux-gnueabihf"
"i686-w64-mingw32"))
(define (demo-os) (define (demo-os)
"Return the \"demo\" 'operating-system' structure." "Return the \"demo\" 'operating-system' structure."
@ -278,6 +279,11 @@ valid."
;; 'mips64el-linux'. ;; 'mips64el-linux'.
(string-contains target system)) (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) (define (either proc1 proc2)
(lambda (x) (lambda (x)
(or (proc1 x) (proc2 x)))) (or (proc1 x) (proc2 x))))
@ -287,7 +293,8 @@ valid."
(package-cross-job store (job-name package) (package-cross-job store (job-name package)
package target system)) package target system))
%packages-to-cross-build)) %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. ;; Turn off grafts. Grafting is meant to happen on the user's machines.
(parameterize ((%graft? #f)) (parameterize ((%graft? #f))