diff options
| author | John Ericson <git@JohnEricson.me> | 2021-01-22 15:15:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 15:15:58 -0500 |
| commit | d95aebbe0e723cb3d275d68b8529f0891a23df96 (patch) | |
| tree | 53d25bb2d4fa366a5f74bacb5e71bda21e7823b6 /pkgs/development/libraries/glibc | |
| parent | 412a9e7d7c8992d77e382f53b7eb1ebefb271735 (diff) | |
| parent | 8929989614589ee3acd070a6409b2b9700c92d65 (diff) | |
| download | nixpkgs-d95aebbe0e723cb3d275d68b8529f0891a23df96.tar nixpkgs-d95aebbe0e723cb3d275d68b8529f0891a23df96.tar.gz nixpkgs-d95aebbe0e723cb3d275d68b8529f0891a23df96.tar.bz2 nixpkgs-d95aebbe0e723cb3d275d68b8529f0891a23df96.tar.lz nixpkgs-d95aebbe0e723cb3d275d68b8529f0891a23df96.tar.xz nixpkgs-d95aebbe0e723cb3d275d68b8529f0891a23df96.tar.zst nixpkgs-d95aebbe0e723cb3d275d68b8529f0891a23df96.zip | |
Merge pull request #107214 from Ericson2314/linux-config-cleanup
lib: Clean up how linux and gcc config is specified
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 6b17e463d76..6637a9bb2a3 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation ({ "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ (lib.flip lib.withFeature "fp" - (stdenv.hostPlatform.platform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft")) + (stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft")) "--with-__thread" ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch32) [ "--host=arm-linux-gnueabi" |