about summary refs log tree commit diff
path: root/pkgs/development/libraries/glibc
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2012-12-28 21:16:25 +0100
committerLluís Batlle i Rossell <viric@viric.name>2012-12-28 21:16:25 +0100
commit4485ee59166a25106136b3e77f6e731fd39d82fd (patch)
tree888f50a128c20dafb5a9088a584b4cace6ed2b64 /pkgs/development/libraries/glibc
parentf2f50c42d2c705dc59465c070f5259a4ad00cf4c (diff)
downloadnixlib-4485ee59166a25106136b3e77f6e731fd39d82fd.tar
nixlib-4485ee59166a25106136b3e77f6e731fd39d82fd.tar.gz
nixlib-4485ee59166a25106136b3e77f6e731fd39d82fd.tar.bz2
nixlib-4485ee59166a25106136b3e77f6e731fd39d82fd.tar.lz
nixlib-4485ee59166a25106136b3e77f6e731fd39d82fd.tar.xz
nixlib-4485ee59166a25106136b3e77f6e731fd39d82fd.tar.zst
nixlib-4485ee59166a25106136b3e77f6e731fd39d82fd.zip
glibc: removing raspberrypi specific code
I think its --with-fp or --without-fp makes nothing, for arm.
Diffstat (limited to 'pkgs/development/libraries/glibc')
-rw-r--r--pkgs/development/libraries/glibc/2.16/common.nix12
1 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.16/common.nix
index a8cb4f2b1d05..3876cf237c8c 100644
--- a/pkgs/development/libraries/glibc/2.16/common.nix
+++ b/pkgs/development/libraries/glibc/2.16/common.nix
@@ -114,19 +114,9 @@ stdenv.mkDerivation ({
           && cross.platform.kernelMajor == "2.6") [
       "--enable-kernel=2.6.0"
       "--with-__thread"
-    ] ++ stdenv.lib.optionals (cross == null &&
-         (stdenv.system == "armv5tel-linux")) [
+    ] ++ stdenv.lib.optionals (cross == null && stdenv.isArm) [
       "--host=arm-linux-gnueabi"
       "--build=arm-linux-gnueabi"
-      "--without-fp"
-
-      # 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 && stdenv.platform.name == "raspberrypi") [
-      "--host=arm-linux-gnueabi"
-      "--build=arm-linux-gnueabi"
-      "--with-fp"
 
       # To avoid linking with -lgcc_s (dynamic link)
       # so the glibc does not depend on its compiler store path