diff options
Diffstat (limited to 'build-aux/hydra/gnu-system.scm')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 26c7b3ca45..cddda85eac 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -54,7 +54,6 @@ (gnu packages compression) (gnu packages multiprecision) (gnu packages make-bootstrap) - (gnu packages commencement) (gnu packages package-management) (gnu system) (gnu system vm) @@ -112,7 +111,7 @@ SYSTEM." gawk gnu-gettext hello guile-2.0 zlib gzip xz %bootstrap-binaries-tarball %binutils-bootstrap-tarball - %glibc-bootstrap-tarball + (%glibc-bootstrap-tarball) %gcc-bootstrap-tarball %guile-bootstrap-tarball %bootstrap-tarballs)) @@ -123,7 +122,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." @@ -240,7 +240,7 @@ all its dependencies, and ready to be installed on non-GuixSD distributions.") (match (package-transitive-inputs package) (((_ inputs _ ...) ...) inputs)))) - %final-inputs)))) + (%final-inputs))))) (lambda (store package system) "Return a job for PACKAGE on SYSTEM, or #f if this combination is not valid." @@ -278,16 +278,22 @@ valid." ;; 'mips64el-linux'. (string-contains target system)) - (define (either proc1 proc2) + (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 proc3) (lambda (x) - (or (proc1 x) (proc2 x)))) + (or (proc1 x) (proc2 x) (proc3 x)))) (append-map (lambda (target) (map (lambda (package) (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)) |