summary refs log tree commit diff
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-02-04 20:24:46 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2017-01-24 22:13:47 +0200
commit41fd1ed90346a3d7f6b067301ac9e147ef4dcd5e (patch)
treec5b86f0c5076959a9259aae0fc3998c86aa6bcfa
parentfd60260a770739eb206f6f063cc30bf4beb21b88 (diff)
downloadnixlib-41fd1ed90346a3d7f6b067301ac9e147ef4dcd5e.tar
nixlib-41fd1ed90346a3d7f6b067301ac9e147ef4dcd5e.tar.gz
nixlib-41fd1ed90346a3d7f6b067301ac9e147ef4dcd5e.tar.bz2
nixlib-41fd1ed90346a3d7f6b067301ac9e147ef4dcd5e.tar.lz
nixlib-41fd1ed90346a3d7f6b067301ac9e147ef4dcd5e.tar.xz
nixlib-41fd1ed90346a3d7f6b067301ac9e147ef4dcd5e.tar.zst
nixlib-41fd1ed90346a3d7f6b067301ac9e147ef4dcd5e.zip
glibc: Check that 'cross.float' is defined
Because if we define it, then gcc compilation fails because it doesn't
support --with-float for aarch64.
-rw-r--r--pkgs/development/libraries/glibc/common.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 4e03293fdf96..32c1b3647372 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation ({
       "--enable-kernel=2.6.32"
     ] ++ lib.optionals (cross != null) [
       (if cross.withTLS then "--with-tls" else "--without-tls")
-      (if cross.float == "soft" then "--without-fp" else "--with-fp")
+      (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp")
     ] ++ lib.optionals (cross != null
           && cross.platform ? kernelMajor
           && cross.platform.kernelMajor == "2.6") [