diff options
Diffstat (limited to 'build-aux/hydra')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index e77604109e..8178871747 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. @@ -314,6 +314,12 @@ valid." (((? string?) (? string?) ...) 'list) ; only build selected list of packages (_ 'all))) ; build everything + (define systems + (match (assoc-ref arguments 'systems) + (#f %hydra-supported-systems) + ((lst ...) lst) + ((? string? str) (call-with-input-string str read)))) + (define (cross-jobs system) (define (from-32-to-64? target) ;; Return true if SYSTEM is 32-bit and TARGET is 64-bit. This hack @@ -334,8 +340,15 @@ valid." (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)))) + (match system + ((or "x86_64-linux" "i686-linux") + (if (string-contains target "mingw") + (not (string=? "x86_64-linux" system)) + #f)) + (_ + ;; Don't try to cross-compile from non-Intel platforms: this isn't + ;; very useful and these are often brittle configurations. + #t))) (define (either proc1 proc2 proc3) (lambda (x) @@ -397,4 +410,4 @@ valid." '())) (else (error "unknown subset" subset)))) - %hydra-supported-systems))) + systems))) |