1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00

gnu: commencement: Provide Make without Guile support.

Guile support is unused so this is a welcome simplification.

* gnu/packages/commencement.scm (make-gnu-make-final): Remove.
(%final-inputs): Remove call to ‘make-gnu-make-final’.  Add ‘gnu-make’ without
dependencies and without “debug” output to the main list.

Change-Id: I8a4d75b04eda22d49c4442ee4ff57e3bf1bc7d1e
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Merges: #7544
This commit is contained in:
Ludovic Courtès
2026-03-14 22:20:09 +01:00
parent f9767a93d9
commit 5e8af7fd4b

View File

@@ -3501,23 +3501,6 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define %boot5-inputs %boot4-inputs)
(define with-boot5 with-boot4)
(define (make-gnu-make-final)
"Compute the final GNU Make, which uses the final Guile."
(let ((pkg-config (package
(inherit %pkg-config) ;the native pkg-config
(inputs (cons* guile-final (%boot5-inputs)))
(arguments
(cons* #:implicit-inputs? #f
(package-arguments %pkg-config))))))
(package
(inherit (package-with-bootstrap-guile gnu-make))
(inputs (cons* guile-final (%boot5-inputs)))
(native-inputs (list pkg-config))
(arguments
(cons* #:implicit-inputs? #f
(package-arguments gnu-make))))))
(define coreutils-final
;; The final Coreutils. Treat them specially because some packages, such as
;; Findutils, keep a reference to the Coreutils they were built with.
@@ -3595,12 +3578,15 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(list (if (target-hurd?)
glibc-utf8-locales-final/hurd
glibc-utf8-locales-final))))
(package/inherit gnu-make ;without Guile support
(outputs '("out")) ;no "debug" output
(native-inputs '())
(inputs '()))
zstd))
(list sed-final
grep-final
xz-final
coreutils-final
(make-gnu-make-final)
bash-final
ld-wrapper
binutils-final)))