diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-11-13 00:34:16 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-11-13 00:34:16 +0100 |
| commit | 2cab1dd58b9a8fb4db8f46a0b00e1358fc0de21b (patch) | |
| tree | b0f12de9371ebbd806214df841cf3a1c116d5431 /gnu/packages/make-bootstrap.scm | |
| parent | 15abcabe4e1d34416714eae66dba32ff96d05a6f (diff) | |
| parent | de7da4e5d14a1acace1a89d9c520d336eecc7e45 (diff) | |
| download | guix-2cab1dd58b9a8fb4db8f46a0b00e1358fc0de21b.tar guix-2cab1dd58b9a8fb4db8f46a0b00e1358fc0de21b.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/make-bootstrap.scm')
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index f2bae7753f..f31db6aaef 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -113,9 +113,6 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (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) @@ -183,7 +180,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (("-Wl,-export-dynamic") ""))) ,phases))))) (inputs (if (%current-target-system) - `(("bash" ,%bash-static)) + `(("bash" ,static-bash)) '())))) (tar (package (inherit tar) (arguments @@ -210,7 +207,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ("sed" ,sed) ("grep" ,grep) ("gawk" ,gawk))) - ("bash" ,%bash-static)))) + ("bash" ,static-bash)))) (define %static-binaries (package @@ -525,6 +522,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (patches patches))) (guile (package (inherit guile-2.0) (name (string-append (package-name guile-2.0) "-static")) + (replacement #f) (source source) (synopsis "Statically-linked and relocatable Guile") |