diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-22 20:33:55 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-23 10:01:28 -0500 |
commit | 9c213398b312e0f0bb9cdf05090fd20223a82ad0 (patch) | |
tree | c645a940abedfc4abf51dbb99ce1a8e871e5e799 /pkgs/development/libraries/glibc | |
parent | 2bc16b381e09eeb75deefdf6fd5bdc4771b795f3 (diff) | |
download | nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.gz nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.bz2 nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.lz nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.xz nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.zst nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.zip |
lib: Clean up how linux and gcc config is specified
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that commit for details. This reverts commit 0bc275e63423456d6deb650e146120c39c1e0723.
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" |