diff options
| author | Shea Levy <shea@shealevy.com> | 2012-06-27 13:48:22 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-06-27 13:48:22 -0400 |
| commit | 8cc0edaeba590df8d5e20bb78378159eafe6ef87 (patch) | |
| tree | 7fec0d02e5bc0e74b9fe67783c44b1adba242ae2 /pkgs/development/libraries/glibc | |
| parent | fd0a9f6bae6a34607092fd63e316168a21bc1061 (diff) | |
| parent | 9400646dcd17986e523d7c14d5bd219937fd3ee7 (diff) | |
| download | nixlib-8cc0edaeba590df8d5e20bb78378159eafe6ef87.tar nixlib-8cc0edaeba590df8d5e20bb78378159eafe6ef87.tar.gz nixlib-8cc0edaeba590df8d5e20bb78378159eafe6ef87.tar.bz2 nixlib-8cc0edaeba590df8d5e20bb78378159eafe6ef87.tar.lz nixlib-8cc0edaeba590df8d5e20bb78378159eafe6ef87.tar.xz nixlib-8cc0edaeba590df8d5e20bb78378159eafe6ef87.tar.zst nixlib-8cc0edaeba590df8d5e20bb78378159eafe6ef87.zip | |
Merge branch 'master' into stdenv-updates
ssp is disabled for glibc-2.13 unconditionally
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/2.13/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/2.14/common.nix | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 536f23fe3bb2..535fb373e04e 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -103,6 +103,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") @@ -112,6 +113,9 @@ stdenv.mkDerivation ({ ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") (if cross.float == "soft" then "--without-fp" else "--with-fp") + ] ++ stdenv.lib.optionals (cross != null + && cross.platform ? kernelMajor + && cross.platform.kernelMajor == "2.6") [ "--enable-kernel=2.6.0" "--with-__thread" ] ++ stdenv.lib.optionals stdenv.isArm [ 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") |