diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 17:31:07 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 18:02:00 -0400 |
| commit | 1fe81a4bcd25dba9319bc1bb49b078872f28ffa6 (patch) | |
| tree | 7b3e9f467f4f7912645760fcbc73efc5bed47409 /pkgs/development/libraries/glibc | |
| parent | c9f6a82b619675a4ee1eb4fe9eac57efb69232fe (diff) | |
| download | nixpkgs-1fe81a4bcd25dba9319bc1bb49b078872f28ffa6.tar nixpkgs-1fe81a4bcd25dba9319bc1bb49b078872f28ffa6.tar.gz nixpkgs-1fe81a4bcd25dba9319bc1bb49b078872f28ffa6.tar.bz2 nixpkgs-1fe81a4bcd25dba9319bc1bb49b078872f28ffa6.tar.lz nixpkgs-1fe81a4bcd25dba9319bc1bb49b078872f28ffa6.tar.xz nixpkgs-1fe81a4bcd25dba9319bc1bb49b078872f28ffa6.tar.zst nixpkgs-1fe81a4bcd25dba9319bc1bb49b078872f28ffa6.zip | |
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.
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 5179ce4a9a8..0e363fe4a25 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -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) [ |