lib: Clean up float/fpu options

ARM ABIs now have a float field. This is used as a fallback to lessen
our use of `platform.gcc.float`. I didn't know what the MIPs convention
is so I kept using `platform.gcc.float` in that case.
This commit is contained in:
John Ericson
2018-05-10 17:31:07 -04:00
parent c9f6a82b61
commit 1fe81a4bcd
5 changed files with 25 additions and 29 deletions

View File

@@ -127,7 +127,9 @@ stdenv.mkDerivation ({
] ++ lib.optionals withLinuxHeaders [
"--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
] ++ lib.optionals (cross != null) [
(if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp")
(if cross.platform.gcc.float or (cross.parsed.abi.float or "hard") == "soft"
then "--without-fp"
else "--with-fp")
] ++ lib.optionals (cross != null) [
"--with-__thread"
] ++ lib.optionals (cross == null && stdenv.isAarch32) [