From 41fd1ed90346a3d7f6b067301ac9e147ef4dcd5e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 4 Feb 2016 20:24:46 +0200 Subject: [PATCH] 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. --- pkgs/development/libraries/glibc/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 4e03293fdf9..32c1b364737 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") [