janneke pushed a commit to branch wip-hurd
in repository guix.
commit 8d113be06d6961fe2d1d11ee5b1fa4f33a49da11
Author: Jan Nieuwenhuizen <[email protected]>
AuthorDate: Tue Mar 3 20:14:24 2020 +0100
gnu: commencement: glibc-final: Allow gnumach-headers references.
* gnu/packages/commencement.scm (glibc-final): Allow gnumach-headers-boot0
references for the Hurd.
---
gnu/packages/commencement.scm | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 11eab51..eed0fb5 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3381,7 +3381,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"$@\"~%"
"/lib"))))
((#:phases phases)
`(modify-phases ,phases
- ,@(if (hurd-target?)
+ ,@(if (hurd-system?)
'((add-after 'unpack 'patch-man2html
(lambda _
(substitute* "support/Makefile.in"
@@ -3448,10 +3448,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker
-Wl,~a/~a \"$@\"~%"
;; if 'allowed-references' were per-output.
(arguments
`(#:allowed-references
- ,(cons* `(,gcc-boot0 "lib") (kernel-headers-boot0)
- static-bash-for-glibc
- (package-outputs glibc-final-with-bootstrap-bash))
-
+ ((,gcc-boot0 "lib")
+ ,(kernel-headers-boot0)
+ ,static-bash-for-glibc
+ ,@(if (hurd-triplet? (%current-system))
+ `(,gnumach-headers-boot0
+ ,hurd-headers-boot0)
+ '())
+ ,@(package-outputs glibc-final-with-bootstrap-bash))
,@(package-arguments glibc-final-with-bootstrap-bash)))))
(define gcc-boot0-wrapped
