ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

distro: glibc: Fix contradicting settings of `BASH_SHELL'.

Browse source 
* distro/packages/base.scm (glibc-final): Remove `ac_cv_path_BASH_SHELL'
  setting.
  (glibc): Set `BASH_SHELL' instead of `ac_cv_path_BASH_SHELL'.
This commit is contained in:
Ludovic Courtès 2013-01-01 23:50:52 +01:00
parent 93b0357575
commit 8cd8e97cb5
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
distro/packages/base.scm
View file

@ -495,13 +495,13 @@ (define-public glibc
;; GNU libc for details. ;; GNU libc for details.
"--enable-kernel=2.6.30" "--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. ;; Use our Bash instead of /bin/sh.
(string-append "ac_cv_path_BASH_SHELL=" (string-append "BASH_SHELL="
(assoc-ref %build-inputs "bash") (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 #:tests? #f ; XXX
#:phases (alist-cons-before #:phases (alist-cons-before
@ -783,7 +783,6 @@ (define-public glibc-final
`(append (list ,(string-append "--host=" (boot-triplet system)) `(append (list ,(string-append "--host=" (boot-triplet system))
,(string-append "--build=" ,(string-append "--build="
(nix-system->gnu-triplet system)) (nix-system->gnu-triplet system))
"BASH_SHELL=/bin/sh"
;; Build Sun/ONC RPC support. In particular, ;; Build Sun/ONC RPC support. In particular,
;; install rpc/*.h. ;; install rpc/*.h.