From 8cd8e97cb5e4a32c20cbab6c048f5213509c4ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 1 Jan 2013 23:50:52 +0100
Subject: [PATCH] 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'.
---
 distro/packages/base.scm | 11 +++++------
 1 file 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 @@ (define-public glibc
             ;; 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 @@ (define-public glibc-final
                `(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.