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

gnu: cross-libc: Use the correct libc. 

* gnu/packages/cross-base.scm (cross-libc): Use cross-libc-for-target
to determine the correct libc to use.
This commit is contained in:
Manolis Ragkousis 2016-08-11 21:28:00 +03:00
parent 5bde4503ee
commit d76181a7a3
No known key found for this signature in database
GPG Key ID: 327C1EF38DF54C32
1 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -464,7 +464,9 @@ XBINUTILS and the cross tool chain."
((or "i586-pc-gnu" "i586-gnu") glibc/hurd)
(_ glibc/linux)))
(package (inherit glibc)
;; Use (cross-libc-for-target ...) to determine the correct libc to use.
(let ((libc (cross-libc-for-target target)))
(package (inherit libc)
(name (string-append "glibc-cross-" target))
(arguments
(substitute-keyword-arguments
@ -481,9 +483,7 @@ XBINUTILS and the cross tool chain."
(guix build utils)
(srfi srfi-26))
;; Package-arguments does not use the correct libc, so we use
;; (cross-libc-for-target ...) to determine the correct one.
,@(package-arguments (cross-libc-for-target target)))
,@(package-arguments libc))
((#:configure-flags flags)
`(cons ,(string-append "--host=" target)
,flags))
@ -518,8 +518,8 @@ XBINUTILS and the cross tool chain."
,@(assoc-ref (package-native-inputs xheaders)
"cross-mig")))
'())
,@(package-inputs glibc) ;FIXME: static-bash
,@(package-native-inputs glibc)))))
,@(package-inputs libc) ;FIXME: static-bash
,@(package-native-inputs libc))))))
;;;