guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: hydra: Remove cross-builds from armhf-linux to mips64el-linux-gnu


From: Mark H. Weaver
Subject: 01/01: hydra: Remove cross-builds from armhf-linux to mips64el-linux-gnuabi64.
Date: Wed, 09 Sep 2015 20:36:15 +0000

mhw pushed a commit to branch core-updates
in repository guix.

commit eb55e28c84988abe15b6675a403fa07b75cbf209
Author: Mark H Weaver <address@hidden>
Date:   Wed Sep 9 16:31:42 2015 -0400

    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 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index b537aa7..d586d90 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]