diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-28 16:53:18 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-28 16:53:18 +0000 |
| commit | affca4a11cd0b79682398941eec6196df56818e8 (patch) | |
| tree | 7ee73cc712f6bdcd959a2edc6e8c17de8259f3cd /pkgs/development/libraries/glibc | |
| parent | 33d3cf2d1c86fa537d0c563668db9d99f331f299 (diff) | |
| download | nixlib-affca4a11cd0b79682398941eec6196df56818e8.tar nixlib-affca4a11cd0b79682398941eec6196df56818e8.tar.gz nixlib-affca4a11cd0b79682398941eec6196df56818e8.tar.bz2 nixlib-affca4a11cd0b79682398941eec6196df56818e8.tar.lz nixlib-affca4a11cd0b79682398941eec6196df56818e8.tar.xz nixlib-affca4a11cd0b79682398941eec6196df56818e8.tar.zst nixlib-affca4a11cd0b79682398941eec6196df56818e8.zip | |
Making the raspberrypi glibc include hard float.
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/2.16/common.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.16/common.nix index ea54b45a50de..a8cb4f2b1d05 100644 --- a/pkgs/development/libraries/glibc/2.16/common.nix +++ b/pkgs/development/libraries/glibc/2.16/common.nix @@ -114,10 +114,20 @@ stdenv.mkDerivation ({ && cross.platform.kernelMajor == "2.6") [ "--enable-kernel=2.6.0" "--with-__thread" - ] ++ stdenv.lib.optionals stdenv.isArm [ + ] ++ stdenv.lib.optionals (cross == null && + (stdenv.system == "armv5tel-linux")) [ "--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 "libc_cv_as_needed=no" |