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

gdc: init at 9.3.0

Browse Source
This commit is contained in:
Stefan Frijters
2019-09-20 12:05:57 +02:00
parent 2c37314aaf
commit fc9b93d2fc
6 changed files with 160 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/gcc/common/configure-flags.nix
View File

@@ -14,6 +14,7 @@
, langC
, langCC
, langD ? false
, langFortran
, langJava ? false, javaAwtGtk ? false, javaAntlr ? null, javaEcj ? null
, langAda ? false
@@ -114,6 +115,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"
@@ -174,6 +176,9 @@ let
"libat_cv_have_ifunc=no"
"--disable-gnu-indirect-function"
]
++ lib.optionals (langD) [
"--with-target-system-zlib=yes"
]
;
in configureFlags

8
pkgs/development/compilers/gcc/common/extra-target-flags.nix
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