diff options
author | Ludovic Courtès <ludo@gnu.org> | 2014-03-25 13:55:56 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-25 13:55:56 +0100 |
commit | e795890212c3c1debe94f7c6921ee572089fd067 (patch) | |
tree | c276e73529490929a1329de84336bf4fef2bf148 /build-aux/hydra | |
parent | 707c8b2ca7a597341610b3fddb6df4a30f77b6bb (diff) | |
download | guix-e795890212c3c1debe94f7c6921ee572089fd067.tar.gz |
hydra: Remove cross-builds from i686-linux to mips64el-linux-gnuabi64.
* build-aux/hydra/gnu-system.scm (hydra-jobs)[cross-jobs]: Define 'from-32-to-64?'. Filter out %CROSS-TARGETS that match.
Diffstat (limited to 'build-aux/hydra')
-rw-r--r-- | build-aux/hydra/gnu-system.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 6e61739d94..4573e60d3b 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -129,12 +129,19 @@ SYSTEM." (compose string->symbol package-full-name)) (define (cross-jobs system) + (define (from-32-to-64? target) + ;; Return true if SYSTEM is 32-bit and TARGET is 64-bit. + ;; This hacks prevents known-to-fail cross-builds from i686-linux to + ;; mips64el-linux-gnuabi64. + (and (string-prefix? "i686-" system) + (string-suffix? "64" target))) + (append-map (lambda (target) (map (lambda (package) (package-cross-job store (job-name package) package target system)) %packages-to-cross-build)) - %cross-targets)) + (remove from-32-to-64? %cross-targets))) ;; Return one job for each package, except bootstrap packages. (let ((base-packages (delete-duplicates |