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

Revert "lib: Clean up how linux and gcc config is specified"

Browse Source 
This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614.
This commit is contained in:
Jonathan Ringer
2021-01-22 14:07:06 -08:00
parent 2e5475381b
commit 0bc275e634
37 changed files with 434 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/glibc/common.nix
+1 -1
View File
@@ -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.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"))
(stdenv.hostPlatform.platform.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"