From 951ccd21a11aa6c931bfc96b42dda7f451cdbbf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 12 Nov 2010 21:04:19 +0000
Subject: [PATCH] Fixing ghdl build (its Makefiles cannot stand
 enableParallelBuild)

svn path=/nixpkgs/branches/stdenv-updates/; revision=24679
---
 pkgs/development/compilers/gcc-4.3/default.nix | 3 ++-
 pkgs/development/compilers/gcc-4.4/default.nix | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc-4.3/default.nix b/pkgs/development/compilers/gcc-4.3/default.nix
index b9d0d9bff5df..57fc0f805c47 100644
--- a/pkgs/development/compilers/gcc-4.3/default.nix
+++ b/pkgs/development/compilers/gcc-4.3/default.nix
@@ -127,7 +127,8 @@ stdenv.mkDerivation ({
   passthru = { inherit langC langCC langFortran langVhdl langTreelang
       enableMultilib; };
 
-  enableParallelBuilding = true;
+  # ghdl does not build fine with parallel building
+  enableParallelBuilding = if langVhdl then false else true;
 
   meta = {
     homepage = "http://gcc.gnu.org/";
diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix
index bc9c2c89e1db..6c2897c56c4c 100644
--- a/pkgs/development/compilers/gcc-4.4/default.nix
+++ b/pkgs/development/compilers/gcc-4.4/default.nix
@@ -247,7 +247,8 @@ stdenv.mkDerivation ({
   passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl
       enableMultilib version; };
 
-  enableParallelBuilding = true;
+  # ghdl does not build fine with parallel building
+  enableParallelBuilding = if langVhdl then false else true;
 
   meta = {
     homepage = http://gcc.gnu.org/;