From 3abd66aa0cb8820124d249e497c95bd0cadb8ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 13 Oct 2016 16:24:30 +0200 Subject: [PATCH] gnu: make-bootstrap: Remove duplicate definition of 'bash-static'. * gnu/packages/make-bootstrap.scm (%bash-static): Remove. (%static-inputs): Use STATIC-BASH instead of %BASH-STATIC. --- gnu/packages/make-bootstrap.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index def9c23b17..2c14e748f2 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -114,9 +114,6 @@ (define (native-inputs) (current-source-location) #:native-inputs native-inputs)) -(define %bash-static - (static-package bash-minimal)) - (define %static-inputs ;; Packages that are to be used as %BOOTSTRAP-INPUTS. (let ((coreutils (package (inherit coreutils) @@ -184,7 +181,7 @@ (define %static-inputs (("-Wl,-export-dynamic") ""))) ,phases))))) (inputs (if (%current-target-system) - `(("bash" ,%bash-static)) + `(("bash" ,static-bash)) '())))) (finalize (compose static-package package-with-relocatable-glibc))) @@ -200,7 +197,7 @@ (define %static-inputs ("sed" ,sed) ("grep" ,grep) ("gawk" ,gawk))) - ("bash" ,%bash-static)))) + ("bash" ,static-bash)))) (define %static-binaries (package