diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-01-14 19:40:58 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-01-14 19:40:58 +0100 |
| commit | 6ee01481c36949680d775af6a125dae2ad4b492d (patch) | |
| tree | e9a119b826367635990e6b9b15ffa30fd52681c2 /gnu | |
| parent | df5188ddfa0c004009c7fcb0ce09a27bb50b9a59 (diff) | |
gnu: Don't build the mips64el-linux-gnuabi64 cross-compiler on i686.
Fixes <http://bugs.gnu.org/19598>.
Reported by Mark H Weaver <mhw@netris.org>.
* gnu/packages/cross-base.scm (xgcc-mips64el): Remove "i686-linux" from
'supported-systems'.
Diffstat (limited to 'gnu')
| -rw-r--r-- | 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 794d925841a..a062128a79e 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> | 3 | ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> |
| 4 | ;;; | 4 | ;;; |
| 5 | ;;; This file is part of GNU Guix. | 5 | ;;; This file is part of GNU Guix. |
| @@ -308,10 +308,15 @@ XBINUTILS and the cross tool chain." | |||
| 308 | ;;; | 308 | ;;; |
| 309 | 309 | ||
| 310 | (define-public xgcc-mips64el | 310 | (define-public xgcc-mips64el |
| 311 | (let ((triplet "mips64el-linux-gnuabi64")) ; N64 ABI | 311 | (let* ((triplet "mips64el-linux-gnuabi64") ;N64 ABI |
| 312 | (cross-gcc triplet | 312 | (xgcc (cross-gcc triplet |
| 313 | (cross-binutils triplet) | 313 | (cross-binutils triplet) |
| 314 | (cross-libc triplet)))) | 314 | (cross-libc triplet)))) |
| 315 | ;; Don't attempt to build this cross-compiler on i686; | ||
| 316 | ;; see <http://bugs.gnu.org/19598>. | ||
| 317 | (package (inherit xgcc) | ||
| 318 | (supported-systems (delete "i686-linux" | ||
| 319 | (package-supported-systems xgcc)))))) | ||
| 315 | 320 | ||
| 316 | (define-public xgcc-avr | 321 | (define-public xgcc-avr |
| 317 | ;; AVR cross-compiler, used to build AVR-Libc. | 322 | ;; AVR cross-compiler, used to build AVR-Libc. |
