public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glibc: Check that 'cross.float' is defined

Browse Source 
Because if we define it, then gcc compilation fails because it doesn't
support --with-float for aarch64.
This commit is contained in:
Tuomas Tynkkynen 2016-02-04 20:24:46 +02:00
parent fd60260a77
commit 41fd1ed903
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/glibc/common.nix
View File

@ -93,7 +93,7 @@ stdenv.mkDerivation ({
"--enable-kernel=2.6.32" "--enable-kernel=2.6.32"
] ++ lib.optionals (cross != null) [ ] ++ lib.optionals (cross != null) [
(if cross.withTLS then "--with-tls" else "--without-tls") (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 ] ++ lib.optionals (cross != null
&& cross.platform ? kernelMajor && cross.platform ? kernelMajor
&& cross.platform.kernelMajor == "2.6") [ && cross.platform.kernelMajor == "2.6") [