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

Merge pull request #107214 from Ericson2314/linux-config-cleanup

Browse Source 
lib: Clean up how linux and gcc config is specified
This commit is contained in:
John Ericson
2021-01-22 15:15:58 -05:00
committed by GitHub
parent 412a9e7d7c 8929989614
commit d95aebbe0e
37 changed files with 429 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/glibc/common.nix
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.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"