diff options
| author | Shea Levy <shea@shealevy.com> | 2012-06-27 11:11:36 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-06-27 11:11:36 -0400 |
| commit | 9400646dcd17986e523d7c14d5bd219937fd3ee7 (patch) | |
| tree | 5bc0ff1e8c49e1cb83c9a76f4b9ec3a550c3a196 /pkgs/development/libraries/glibc | |
| parent | aecc8b64ed60859578884d393fa357491024687c (diff) | |
| parent | f5a5915f6e3e1756b4ce78d38c2655a912e156c4 (diff) | |
| download | nixlib-9400646dcd17986e523d7c14d5bd219937fd3ee7.tar nixlib-9400646dcd17986e523d7c14d5bd219937fd3ee7.tar.gz nixlib-9400646dcd17986e523d7c14d5bd219937fd3ee7.tar.bz2 nixlib-9400646dcd17986e523d7c14d5bd219937fd3ee7.tar.lz nixlib-9400646dcd17986e523d7c14d5bd219937fd3ee7.tar.xz nixlib-9400646dcd17986e523d7c14d5bd219937fd3ee7.tar.zst nixlib-9400646dcd17986e523d7c14d5bd219937fd3ee7.zip | |
Merge remote-tracking branch 'aszlig/glibc_ssp_fix'
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
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/2.13/common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/2.14/common.nix | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 4058ed3d3021..cc8c5373ff55 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -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") diff --git a/pkgs/development/libraries/glibc/2.14/common.nix b/pkgs/development/libraries/glibc/2.14/common.nix index a8d0f661b72f..ab3ef7c42f49 100644 --- a/pkgs/development/libraries/glibc/2.14/common.nix +++ b/pkgs/development/libraries/glibc/2.14/common.nix @@ -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") |