[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: Fix another call to cross-gcc.
From: |
Mark H. Weaver |
Subject: |
01/01: gnu: Fix another call to cross-gcc. |
Date: |
Fri, 26 May 2017 04:07:01 -0400 (EDT) |
mhw pushed a commit to branch master
in repository guix.
commit e0775d2a0137711c7150a3b3e01dffd463525b0c
Author: Mark H Weaver <address@hidden>
Date: Fri May 26 03:58:22 2017 -0400
gnu: Fix another call to cross-gcc.
This is a followup to commit 7b3318e34f4e2743254a88b908859901db960e9a.
* gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc)
[native-inputs]: Fix 'cross-gcc' call.
* gnu/packages/cross-base.scm: Fix example 'cross-gcc' call in a comment.
---
gnu/packages/cross-base.scm | 4 ++--
gnu/packages/make-bootstrap.scm | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 54303b7..d5ca9b8 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -494,8 +494,8 @@ XBINUTILS and the cross tool chain."
;; (define-public xgcc-armhf
;; (let ((triplet "arm-linux-gnueabihf"))
;; (cross-gcc triplet
-;; (cross-binutils triplet)
-;; (cross-libc triplet))))
+;; #:xbinutils (cross-binutils triplet)
+;; #:libc (cross-libc triplet))))
;;
;;; We don't do that here because we'd be referring to bindings from (gnu
;;; packages gcc) from the top level, which doesn't play well with circular
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 2c6d1f5..9efe338 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -99,8 +99,8 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(if (%current-target-system)
(let ((target (%current-target-system)))
`(("cross-gcc" ,(cross-gcc target
- (cross-binutils target)
- (cross-bootstrap-libc)))
+ #:xbinutils (cross-binutils target)
+ #:libc (cross-bootstrap-libc)))
("cross-binutils" ,(cross-binutils target))
,@(%final-inputs)))
`(("libc" ,(glibc-for-bootstrap))