nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Fix another call to cross-gcc. 

This is a followup to commit 7b3318e34f.

* 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.
This commit is contained in:
Mark H Weaver 2017-05-26 03:58:22 -04:00
parent 37a5719642
commit e0775d2a01
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/cross-base.scm
View File

@ -494,8 +494,8 @@ XBINUTILS and the cross tool chain."
;; (define-public xgcc-armhf ;; (define-public xgcc-armhf
;; (let ((triplet "arm-linux-gnueabihf")) ;; (let ((triplet "arm-linux-gnueabihf"))
;; (cross-gcc triplet ;; (cross-gcc triplet
;; (cross-binutils triplet) ;; #:xbinutils (cross-binutils triplet)
;; (cross-libc triplet)))) ;; #:libc (cross-libc triplet))))
;; ;;
;;; We don't do that here because we'd be referring to bindings from (gnu ;;; 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 ;;; packages gcc) from the top level, which doesn't play well with circular

4
gnu/packages/make-bootstrap.scm
View File

@ -99,8 +99,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(if (%current-target-system) (if (%current-target-system)
(let ((target (%current-target-system))) (let ((target (%current-target-system)))
`(("cross-gcc" ,(cross-gcc target `(("cross-gcc" ,(cross-gcc target
(cross-binutils target) #:xbinutils (cross-binutils target)
(cross-bootstrap-libc))) #:libc (cross-bootstrap-libc)))
("cross-binutils" ,(cross-binutils target)) ("cross-binutils" ,(cross-binutils target))
,@(%final-inputs))) ,@(%final-inputs)))
`(("libc" ,(glibc-for-bootstrap)) `(("libc" ,(glibc-for-bootstrap))