guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

18/30: gnu: commencement: glibc-final: Allow gnumach-headers references.


From: guix-commits
Subject: 18/30: gnu: commencement: glibc-final: Allow gnumach-headers references.
Date: Sat, 21 Mar 2020 19:36:28 -0400 (EDT)

janneke pushed a commit to branch wip-hurd
in repository guix.

commit 05d882ab0b35e00a96e5c85311bbceff54fee589
Author: Jan Nieuwenhuizen <address@hidden>
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 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index ea80c50..09758d1 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3426,10 +3426,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-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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]