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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-05-24 10:03:22 +02:00
parent b34551384a bcb05f050e
commit c778596f56
74 changed files with 1073 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc/common/configure-flags.nix
+9 -1
View File
@@ -14,6 +14,7 @@
, langC
, langCC
, langD ? false
, langFortran
, langJava ? false, javaAwtGtk ? false, javaAntlr ? null, javaEcj ? null
, langAda ? false
@@ -115,6 +116,7 @@ let
lib.concatStrings (lib.intersperse ","
( lib.optional langC "c"
++ lib.optional langCC "c++"
++ lib.optional langD "d"
++ lib.optional langFortran "fortran"
++ lib.optional langJava "java"
++ lib.optional langAda "ada"
@@ -175,7 +177,13 @@ let
"--disable-symvers"
"libat_cv_have_ifunc=no"
"--disable-gnu-indirect-function"
] ++ lib.optional langJit "--enable-host-shared"
]
++ lib.optionals langJit [
"--enable-host-shared"
]
++ lib.optionals (langD) [
"--with-target-system-zlib=yes"
]
;
in configureFlags
pkgs/development/compilers/gcc/common/extra-target-flags.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, crossStageStatic, libcCross, threadsCross }:
{ stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }:
let
inherit (stdenv) lib hostPlatform targetPlatform;
@@ -6,13 +6,13 @@ in
{
EXTRA_TARGET_FLAGS = let
mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([
mkFlags = dep: langD: lib.optionals (targetPlatform != hostPlatform && dep != null && !langD) ([
"-idirafter ${lib.getDev dep}${dep.incdir or "/include"}"
] ++ stdenv.lib.optionals (! crossStageStatic) [
"-B${lib.getLib dep}${dep.libdir or "/lib"}"
]);
in mkFlags libcCross
++ lib.optionals (!crossStageStatic) (mkFlags threadsCross)
in mkFlags libcCross langD
++ lib.optionals (!crossStageStatic) (mkFlags threadsCross langD)
;
EXTRA_TARGET_LDFLAGS = let