gcc: Fix building 4.5 and 4.6

2014-01-13 19:11:46 +01:00
parent bccc76f290
commit 033374d601
3 changed files with 10 additions and 4 deletions
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -212,7 +212,7 @@ stdenv.mkDerivation ({
    ++ (optional (ppl != null) ppl)
    ++ (optional (cloogppl != null) cloogppl)
    ++ (optional (zlib != null) zlib)
-    ++ (optional (boehmgc != null) boehmgc)
+    ++ (optional langJava boehmgc)
    ++ (optionals langJava [zip unzip])
    ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs))
    ++ (optionals (cross != null) [binutilsCross])
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -434,7 +434,7 @@ stdenv.mkDerivation ({
  passthru = { inherit langC langCC langAda langFortran langVhdl
      langGo version; };

-  enableParallelBuilding = !langAda;
+  enableParallelBuilding = false;

  inherit (stdenv) is64bit;