diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-09-26 15:14:53 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-26 15:14:53 +0200 |
commit | e1556533d3e57950417b2e35a68e95c65fee5042 (patch) | |
tree | 41d67b065c7828e164af83254fb447849d9e880d /build-aux | |
parent | 5d8d8f3b0a07edb3bd435830b076749f906537d8 (diff) | |
parent | 92f1cefb74f6092c0c70f93140824ab806086272 (diff) | |
download | guix-patches-e1556533d3e57950417b2e35a68e95c65fee5042.tar guix-patches-e1556533d3e57950417b2e35a68e95c65fee5042.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'build-aux')
-rw-r--r-- | build-aux/hydra/gnu-system.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index b537aa7b1d..d586d90ae2 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -221,10 +221,11 @@ valid." (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 + ;; Return true if SYSTEM is 32-bit and TARGET is 64-bit. This hack + ;; prevents known-to-fail cross-builds from i686-linux or armhf-linux to ;; mips64el-linux-gnuabi64. - (and (string-prefix? "i686-" system) + (and (or (string-prefix? "i686-" system) + (string-prefix? "armhf-" system)) (string-suffix? "64" target))) (define (same? target) |