aboutsummaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-09-09 16:31:42 -0400
committerMark H Weaver <mhw@netris.org>2015-09-09 16:35:03 -0400
commiteb55e28c84988abe15b6675a403fa07b75cbf209 (patch)
tree3325d8131215df13615a0196ac5b61c6f9d9ceef /build-aux
parent784d6e9115990b9f44a19d1fbf6d1f84c3e1bfaa (diff)
downloadguix-eb55e28c84988abe15b6675a403fa07b75cbf209.tar
guix-eb55e28c84988abe15b6675a403fa07b75cbf209.tar.gz
hydra: Remove cross-builds from armhf-linux to mips64el-linux-gnuabi64.
* build-aux/hydra/gnu-system.scm (hydra-jobs)[cross-jobs]: Modify 'from-32-to-64?' to include 'armhf-linux' in the set of 32-bit systems.
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/hydra/gnu-system.scm7
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)