guix-commits
[Top][All Lists]
Advanced

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

02/02: hydra: Do not cross-build from non-Intel platforms.


From: Ludovic Courtès
Subject: 02/02: hydra: Do not cross-build from non-Intel platforms.
Date: Fri, 29 Dec 2017 07:45:35 -0500 (EST)

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

commit 8781c3d9fc05528089a4379a5199277ee8062974
Author: Ludovic Courtès <address@hidden>
Date:   Fri Dec 29 13:38:06 2017 +0100

    hydra: Do not cross-build from non-Intel platforms.
    
    * build-aux/hydra/gnu-system.scm (hydra-jobs)[cross-jobs](pointless?):
    Return #t on non-Intel.
---
 build-aux/hydra/gnu-system.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 04845a3..19371be 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -317,8 +317,15 @@ valid."
 
     (define (pointless? target)
       ;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM.
-      (and (string-contains target "mingw")
-           (not (string=? "x86_64-linux" system))))
+      (match system
+        ((or "x86_64-linux" "i686-linux")
+         (if (string-contains target "mingw")
+             (not (string=? "x86_64-linux" system))
+             #f))
+        (_
+         ;; Don't try to cross-compile from non-Intel platforms: this isn't
+         ;; very useful and these are often brittle configurations.
+         #t)))
 
     (define (either proc1 proc2 proc3)
       (lambda (x)



reply via email to

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