JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'aszlig/glibc_ssp_fix'

Browse Source 
glibc 2.13 and 2.14 fail to build with our current stdenv unless the ssp is
disabled. For glibc 2.13, I've only disabled the ssp when it's being built with
a complete stdenv to avoid a stdenv rebuild
This commit is contained in:
Shea Levy 2012-06-27 11:11:36 -04:00
commit 9400646dcd
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/glibc/2.13/common.nix
View File

@ -102,7 +102,8 @@ stdenv.mkDerivation ({
"-C"
"--enable-add-ons"
"--sysconfdir=/etc"
"--localedir=/var/run/current-system/sw/lib/locale"
"--localedir=/var/run/current-system/sw/lib/locale" ] ++
(stdenv.lib.optional (stdenv.name == "stdenv") "libc_cv_ssp=no") ++ [
(if kernelHeaders != null
then "--with-headers=${kernelHeaders}/include"
else "--without-headers")

1
pkgs/development/libraries/glibc/2.14/common.nix
View File

@ -97,6 +97,7 @@ stdenv.mkDerivation ({
"--enable-add-ons"
"--sysconfdir=/etc"
"--localedir=/var/run/current-system/sw/lib/locale"
"libc_cv_ssp=no"
(if kernelHeaders != null
then "--with-headers=${kernelHeaders}/include"
else "--without-headers")