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

mingw-w64 libc: Multiple outputs and parallel builds

Browse Source 
Also deduplicate more of the GCC derivations.
This commit is contained in:
John Ericson
2019-11-11 00:25:24 -05:00
parent 06c5e811e6
commit 999ef20129
11 changed files with 89 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc/common/configure-flags.nix
+1 -1
View File
@@ -49,7 +49,7 @@ let
"--disable-decimal-float" # requires libc
"--disable-libmpx" # requires libc
] ++ lib.optionals crossMingw [
"--with-headers=${libcCross}/include"
"--with-headers=${lib.getDev libcCross}/include"
"--with-gcc"
"--with-gnu-as"
"--with-gnu-ld"
pkgs/development/compilers/gcc/common/extra-target-flags.nix
+28
View File
@@ -0,0 +1,28 @@
{ stdenv, crossStageStatic, libcCross }:
let
inherit (stdenv) lib hostPlatform targetPlatform;
in
{
EXTRA_TARGET_FLAGS = let
mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([
"-idirafter ${lib.getDev dep}${dep.incdir or "/include"}"
] ++ stdenv.lib.optionals (! crossStageStatic) [
"-B${lib.getLib dep}${dep.libdir or "/lib"}"
]);
in mkFlags libcCross
;
EXTRA_TARGET_LDFLAGS = let
mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([
"-Wl,-L${lib.getLib dep}${dep.libdir or "/lib"}"
] ++ (if crossStageStatic then [
"-B${lib.getLib dep}${dep.libdir or "/lib"}"
] else [
"-Wl,-rpath,${lib.getLib dep}${dep.libdir or "/lib"}"
"-Wl,-rpath-link,${lib.getLib dep}${dep.libdir or "/lib"}"
]));
in mkFlags libcCross
;
}