Merge master into staging-next

2020-05-24 10:03:22 +02:00
parent b34551384a bcb05f050e
commit c778596f56
74 changed files with 1073 additions and 521 deletions
@@ -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