aboutsummaryrefslogtreecommitdiff
path: root/build-aux/hydra/gnu-system.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-12-29 13:38:06 +0100
committerLudovic Courtès <ludo@gnu.org>2017-12-29 13:38:06 +0100
commit8781c3d9fc05528089a4379a5199277ee8062974 (patch)
treebf26a090aab99ab160b9f0f5d363cd4d5d811a62 /build-aux/hydra/gnu-system.scm
parentf3c294a2abdfd358c57276b42d535266e2f19984 (diff)
downloadguix-8781c3d9fc05528089a4379a5199277ee8062974.tar
guix-8781c3d9fc05528089a4379a5199277ee8062974.tar.gz
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.
Diffstat (limited to 'build-aux/hydra/gnu-system.scm')
-rw-r--r--build-aux/hydra/gnu-system.scm11
1 files changed, 9 insertions, 2 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 04845a3e1f..19371be3e9 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)