01/01: gnu: Don't build the mips64el-linux-gnuabi64 cross-compiler on i686.

[Ludovic Courtès]

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

commit 6ee01481c36949680d775af6a125dae2ad4b492d
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jan 14 19:40:58 2015 +0100

    gnu: Don't build the mips64el-linux-gnuabi64 cross-compiler on i686.
    
    Fixes <http://bugs.gnu.org/19598>.
    Reported by Mark H Weaver <address@hidden>.
    
    * gnu/packages/cross-base.scm (xgcc-mips64el): Remove "i686-linux" from
      'supported-systems'.
---
 gnu/packages/cross-base.scm |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 794d925..a062128 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -308,10 +308,15 @@ XBINUTILS and the cross tool chain."
 ;;;
 
 (define-public xgcc-mips64el
-  (let ((triplet "mips64el-linux-gnuabi64"))      ; N64 ABI
-    (cross-gcc triplet
-               (cross-binutils triplet)
-               (cross-libc triplet))))
+  (let* ((triplet "mips64el-linux-gnuabi64")      ;N64 ABI
+         (xgcc    (cross-gcc triplet
+                             (cross-binutils triplet)
+                             (cross-libc triplet))))
+    ;; Don't attempt to build this cross-compiler on i686;
+    ;; see <http://bugs.gnu.org/19598>.
+    (package (inherit xgcc)
+      (supported-systems (delete "i686-linux"
+                                 (package-supported-systems xgcc))))))
 
 (define-public xgcc-avr
   ;; AVR cross-compiler, used to build AVR-Libc.