me
/
guix
Archived
1
0
Fork 0
Code

gnu: cross-base: Add cross arguments to hurd derivatives. 

* gnu/packages/cross-base.scm (cross-kernel-headers*): Add --build and --host to
xhurd-headers and xhurd-minimal.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Josselin Poiret 2023-03-20 23:10:40 +01:00 committed by Ludovic Courtès
parent a16a9c5a7b
commit 9a787edb9c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -458,10 +458,17 @@ the base compiler. Use XBINUTILS as the associated cross-Binutils."
(name (string-append (package-name hurd-headers) (name (string-append (package-name hurd-headers)
"-cross-" target)) "-cross-" target))
(arguments
(substitute-keyword-arguments (package-arguments hurd-headers)
((#:configure-flags flags)
`(cons* ,(string-append "--build=" (%current-system))
,(string-append "--host=" target)
,flags))))
(native-inputs `(("cross-gcc" ,xgcc) (native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils) ("cross-binutils" ,xbinutils)
("cross-mig" ,xmig) ("cross-mig" ,xmig)
,@(alist-delete "mig"(package-native-inputs hurd-headers)))))) ,@(alist-delete "mig" (package-native-inputs hurd-headers))))))
(define xglibc/hurd-headers (define xglibc/hurd-headers
(package (package
@ -506,6 +513,10 @@ the base compiler. Use XBINUTILS as the associated cross-Binutils."
(guix build utils) (guix build utils)
(srfi srfi-26)) (srfi srfi-26))
,@(package-arguments hurd-minimal)) ,@(package-arguments hurd-minimal))
((#:configure-flags flags)
`(cons* ,(string-append "--build=" (%current-system))
,(string-append "--host=" target)
,flags))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-before 'configure 'set-cross-headers-path (add-before 'configure 'set-cross-headers-path