From eb55e28c84988abe15b6675a403fa07b75cbf209 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 9 Sep 2015 16:31:42 -0400 Subject: [PATCH] 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. --- build-aux/hydra/gnu-system.scm | 7 ++++--- 1 file 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 @@ (define subset (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)