guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit daaf0ecaedc30e485abba54a4bd8033c62915aa9 Author: Nicolas Graves <[email protected]> AuthorDate: Sat Feb 21 02:01:43 2026 +0100 gnu: static-bash-for-glibc: Improve style. * gnu/packages/commencement.scm (static-bash-for-glibc) [inputs]: Drop input labels. [arguments]: Improve style, use G-expressions. <#:configure-flags>: Use search-input-file. Change-Id: I215a0a796fd24e49410c3a517fa49b9b5e58ed66 Signed-off-by: Ludovic Courtès <[email protected]> --- gnu/packages/commencement.scm | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 141e6cc7e60..f5db9cce349 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3151,24 +3151,25 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (package (inherit static-bash) (source (bootstrap-origin (package-source static-bash))) - (inputs `(("gcc" ,gcc-boot0-intermediate-wrapped) - ("libc" ,glibc-final-with-bootstrap-bash) - ("libc:static" ,glibc-final-with-bootstrap-bash "static") - ,@(fold alist-delete (%boot1-inputs) - '("gcc" "libc")))) + (inputs + (cons* gcc-boot0-intermediate-wrapped + glibc-final-with-bootstrap-bash + (list glibc-final-with-bootstrap-bash "static") + (fold delete + (map cadr (%boot1-inputs)) + (list gcc-boot0 glibc-mesboot)))) (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - - ,@(substitute-keyword-arguments arguments - ((#:configure-flags flags #~'()) - ;; Add a '-L' flag so that the pseudo-cross-ld of - ;; BINUTILS-BOOT0 can find libc.a. - #~(append #$flags - (list (string-append "LDFLAGS=-static -L" - (assoc-ref %build-inputs - "libc:static") - "/lib"))))))))) + (append + (list #:implicit-inputs? #f + #:guile %bootstrap-guile) + (substitute-keyword-arguments arguments + ((#:configure-flags flags #~'()) + ;; Add a '-L' flag so that the pseudo-cross-ld of + ;; BINUTILS-BOOT0 can find libc.a. + #~(let ((libc.a (search-input-file %build-inputs "/lib/libc.a"))) + (append #$flags + (list (string-append "LDFLAGS=-static -L" + (dirname libc.a))))))))))) (define gettext-boot0 ;; A minimal gettext used during bootstrap.
