diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.16/common.nix
index ea54b45a50d..a8cb4f2b1d0 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"