amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Ludovic Courtès 2019-06-13 13:24:35 +02:00
commit d9bbfe042e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
207 changed files with 7409 additions and 2775 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,8 @@
#:export (cross-binutils
cross-libc
cross-gcc
cross-newlib?))
cross-newlib?
cross-kernel-headers))
(define-syntax %xgcc
;; GCC package used as the basis for cross-compilation. It doesn't have to
@ -286,18 +287,19 @@ target that libc."
(define* (cross-kernel-headers target
#:optional
(linux-headers linux-libre-headers)
(xgcc (cross-gcc target))
(xbinutils (cross-binutils target)))
"Return headers depending on TARGET."
(define xlinux-headers
(package (inherit linux-libre-headers)
(name (string-append (package-name linux-libre-headers)
(package (inherit linux-headers)
(name (string-append (package-name linux-headers)
"-cross-" target))
(arguments
(substitute-keyword-arguments
`(#:implicit-cross-inputs? #f
,@(package-arguments linux-libre-headers))
,@(package-arguments linux-headers))
((#:phases phases)
`(alist-replace
'build
@ -310,7 +312,7 @@ target that libc."
,phases))))
(native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils)
,@(package-native-inputs linux-libre-headers)))))
,@(package-native-inputs linux-headers)))))
(define xgnumach-headers
(package (inherit gnumach-headers)