diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-01-01 23:50:52 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-01 23:50:52 +0100 |
| commit | 8cd8e97cb5e4a32c20cbab6c048f5213509c4ac9 (patch) | |
| tree | 039300c35da5c58d9777d1252258065edbd8b2c3 /distro | |
| parent | 93b035757554830d4f4e190aef7d5b90fa845bb0 (diff) | |
| download | guix-8cd8e97cb5e4a32c20cbab6c048f5213509c4ac9.tar.gz guix-8cd8e97cb5e4a32c20cbab6c048f5213509c4ac9.zip | |
distro: glibc: Fix contradicting settings of `BASH_SHELL'.
* distro/packages/base.scm (glibc-final): Remove `ac_cv_path_BASH_SHELL'
setting.
(glibc): Set `BASH_SHELL' instead of `ac_cv_path_BASH_SHELL'.
Diffstat (limited to 'distro')
| -rw-r--r-- | distro/packages/base.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/distro/packages/base.scm b/distro/packages/base.scm index 6b4ee19a25..4acf4c1538 100644 --- a/distro/packages/base.scm +++ b/distro/packages/base.scm @@ -495,13 +495,13 @@ used in the GNU system including the GNU/Linux variant.") ;; GNU libc for details. "--enable-kernel=2.6.30" - ;; XXX: Work around "undefined reference to `__stack_chk_guard'". - "libc_cv_ssp=no" - ;; Use our Bash instead of /bin/sh. - (string-append "ac_cv_path_BASH_SHELL=" + (string-append "BASH_SHELL=" (assoc-ref %build-inputs "bash") - "/bin/bash")) + "/bin/bash") + + ;; XXX: Work around "undefined reference to `__stack_chk_guard'". + "libc_cv_ssp=no") #:tests? #f ; XXX #:phases (alist-cons-before @@ -783,7 +783,6 @@ identifier SYSTEM." `(append (list ,(string-append "--host=" (boot-triplet system)) ,(string-append "--build=" (nix-system->gnu-triplet system)) - "BASH_SHELL=/bin/sh" ;; Build Sun/ONC RPC support. In particular, ;; install rpc/*.h. |