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

11
pkgs/development/web/nodejs/nodejs.nix
View File

@@ -60,18 +60,17 @@ in
configureFlags = let
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
host = stdenv.hostPlatform.platform;
isAarch32 = stdenv.hostPlatform.isAarch32;
inherit (stdenv.hostPlatform) gcc isArch32;
in sharedConfigureFlags ++ [
"--without-dtrace"
] ++ (optionals isCross [
"--cross-compiling"
"--without-intl"
"--without-snapshot"
]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [
"--with-arm-fpu=${host.gcc.fpu}"
]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" host.gcc) [
"--with-arm-float-abi=${host.gcc.float-abi}"
]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" gcc) [
"--with-arm-fpu=${gcc.fpu}"
]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" gcc) [
"--with-arm-float-abi=${gcc.float-abi}"
]) ++ (optionals (isCross && isAarch32) [
"--dest-cpu=arm"
]) ++ extraConfigFlags;