guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 4253617ab6145216173d2a4cb07ed5f657abc142 Author: Nicolas Graves <[email protected]> AuthorDate: Thu Mar 19 18:15:33 2026 +0100 gnu: glibc-final: Improve style. * gnu/packages/commencement.scm (glibc-final): [arguments, inputs]: Refactor using final instead of glibc-final-with-bootstrap-bash. [arguments]: Relocate, avoid quotes. Change-Id: Ieb23328393d20d97a9aae81d1e01ac39e38ba306 Signed-off-by: Ludovic Courtès <[email protected]> --- gnu/packages/commencement.scm | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8b40d78667f..bcd1b94357e 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3191,37 +3191,38 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define/system-dependent glibc-final ;; The final glibc, which embeds the statically-linked Bash built above. ;; Use 'package/inherit' so we get the 'replacement' of 'glibc', if any. - (let ((libc (libc-for-target (%current-system)))) + (let ((libc (libc-for-target (%current-system))) + (final glibc-final-with-bootstrap-bash)) (package/inherit libc (name "glibc") (source (bootstrap-origin (package-source libc))) + ;; The final libc only refers to itself, but the 'debug' output contains + ;; references to GCC-BOOT0 and to the Linux headers. XXX: Would be great + ;; if 'allowed-references' were per-output. + (arguments + (cons* + #:allowed-references + (append (list (gexp-input gcc-boot0 "lib") + (kernel-headers-boot0) + static-bash-for-glibc) + (if (system-hurd?) + (list gnumach-headers-boot0 hurd-headers-boot0) + '()) + (package-outputs final)) + (package-arguments final))) + (inputs - (modify-inputs (package-inputs glibc-final-with-bootstrap-bash) + (modify-inputs (package-inputs final) (delete "bash-mesboot") (prepend static-bash-for-glibc))) ;; This time we need 'msgfmt' to install all the libc.mo files. (native-inputs - (modify-inputs (package-native-inputs glibc-final-with-bootstrap-bash) + (modify-inputs (package-native-inputs final) (append gettext-boot0))) (propagated-inputs - (package-propagated-inputs glibc-final-with-bootstrap-bash)) - - ;; The final libc only refers to itself, but the 'debug' output contains - ;; references to GCC-BOOT0 and to the Linux headers. XXX: Would be great - ;; if 'allowed-references' were per-output. - (arguments - `(#:allowed-references - (,(gexp-input gcc-boot0 "lib") - ,(kernel-headers-boot0) - ,static-bash-for-glibc - ,@(if (system-hurd?) - `(,gnumach-headers-boot0 - ,hurd-headers-boot0) - '()) - ,@(package-outputs glibc-final-with-bootstrap-bash)) - ,@(package-arguments glibc-final-with-bootstrap-bash)))))) + (package-propagated-inputs final))))) (define/system-dependent gcc-boot0-wrapped ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the
