diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-23 20:16:50 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-26 22:01:22 +0000 |
| commit | 68a65bcf2a10a63553a3e5a4a6958e7a0ef98cc6 (patch) | |
| tree | fe68bca5f0fe6ccacec15398afc8055eed2501d5 /pkgs/development/libraries/glibc | |
| parent | 6c9002639dda6738ab9a4d18e62ebddcac4cddd7 (diff) | |
| download | nixlib-68a65bcf2a10a63553a3e5a4a6958e7a0ef98cc6.tar nixlib-68a65bcf2a10a63553a3e5a4a6958e7a0ef98cc6.tar.gz nixlib-68a65bcf2a10a63553a3e5a4a6958e7a0ef98cc6.tar.bz2 nixlib-68a65bcf2a10a63553a3e5a4a6958e7a0ef98cc6.tar.lz nixlib-68a65bcf2a10a63553a3e5a4a6958e7a0ef98cc6.tar.xz nixlib-68a65bcf2a10a63553a3e5a4a6958e7a0ef98cc6.tar.zst nixlib-68a65bcf2a10a63553a3e5a4a6958e7a0ef98cc6.zip | |
Undoing glibc 2.13 work for the pi
(previous attempt of bootstrapping from the armv5tel bootstrap tools)
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/2.13/common.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 316c66c51900..2c43dd05f526 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -8,7 +8,7 @@ cross : , machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null , mig ? null, fetchgit ? null , profilingLibraries ? false, meta -, preConfigure ? "", recentGcc ? true, ... }@args : +, preConfigure ? "", ... }@args : let # For GNU/Hurd, see below. @@ -121,8 +121,7 @@ stdenv.mkDerivation ({ "--enable-kernel=2.6.0" "--with-__thread" ] ++ stdenv.lib.optionals (cross == null && - (stdenv.system == "armv5tel-linux") || - (!recentGcc && stdenv.platform.name == "raspberrypi")) [ + (stdenv.system == "armv5tel-linux")) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" @@ -130,7 +129,7 @@ stdenv.mkDerivation ({ # To avoid linking with -lgcc_s (dynamic link) # so the glibc does not depend on its compiler store path "libc_cv_as_needed=no" - ] ++ stdenv.lib.optionals (cross == null && recentGcc && stdenv.platform.name == "raspberrypi") [ + ] ++ stdenv.lib.optionals (cross == null && stdenv.platform.name == "raspberrypi") [ "--host=arm-linux-gnueabihf" "--build=arm-linux-gnueabihf" "--with-fp" @@ -202,10 +201,6 @@ stdenv.mkDerivation ({ configureScript="`pwd`/../$sourceRoot/configure" ${preConfigure} - '' + stdenv.lib.optionalString (cross == null - && recentGcc - && stdenv.platform.name == "raspberrypi") '' - configureFlagsArray=("CFLAGS=-march=armv6 -mfpu=vfp -mhard-float") ''; meta = { |