diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index 87557bb47795..c97fd4eb495d 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -15,7 +15,7 @@ assert !nativeTools -> gcc != null && binutils != null && coreutils != null;
 assert !nativeLibc -> libc != null;
 
 # For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper
-assert (gcc != null && gcc ? langVhdl) -> zlib != null;
+assert (gcc != null && gcc ? langVhdl && gcc.langVhdl) -> zlib != null;
 
 let
 
@@ -47,8 +47,8 @@ stdenv.mkDerivation {
   langC = if nativeTools then true else gcc.langC;
   langCC = if nativeTools then true else gcc.langCC;
   langFortran = if nativeTools then false else gcc ? langFortran;
-  langAda = if nativeTools then false else gcc ? langAda;
-  langVhdl = if nativeTools then false else gcc ? langVhdl;
+  langAda = if nativeTools then false else gcc ? langAda && gcc.langAda;
+  langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl;
   zlib = if (gcc != null && gcc ? langVhdl) then zlib else null;
   shell = if shell == "" then stdenv.shell else shell;
   
diff --git a/pkgs/development/compilers/gcc-4.3/default.nix b/pkgs/development/compilers/gcc-4.3/default.nix
index ca3577cab05c..73caa156bd01 100644
--- a/pkgs/development/compilers/gcc-4.3/default.nix
+++ b/pkgs/development/compilers/gcc-4.3/default.nix
@@ -124,7 +124,8 @@ stdenv.mkDerivation ({
 
   inherit gmp mpfr;
   
-  passthru = { inherit langC langCC langFortran langTreelang enableMultilib; };
+  passthru = { inherit langC langCC langFortran langVhdl langTreelang
+      enableMultilib; };
 
   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 36b4440cb276..86ac3c189c61 100644
--- a/pkgs/development/compilers/gcc-4.4/default.nix
+++ b/pkgs/development/compilers/gcc-4.4/default.nix
@@ -184,7 +184,8 @@ stdenv.mkDerivation ({
                                           ++ optionals javaAwtGtk [ gmp mpfr ])));
 
 
-  passthru = { inherit langC langCC langAda langFortran langTreelang enableMultilib; };
+  passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl
+      enableMultilib; };
 
   meta = {
     homepage = http://gcc.gnu.org/;