3 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/build-support/gnat-wrapper/builder.sh b/pkgs/build-support/gnat-wrapper/builder.sh
index 9befd517439d..e416766db66f 100644
--- a/pkgs/build-support/gnat-wrapper/builder.sh
+++ b/pkgs/build-support/gnat-wrapper/builder.sh
@@ -51,10 +51,11 @@ else
     if test -e "$gcc/lib64"; then
         gccCFlags="$gccCFlags -B$gcc/lib64"
     fi
-    gccCFlags="$gccCFlags -B$gcc/lib/gnatgcc/x86_64-pc-linux-gnu/4.1/ -I$gcc/lib/gnatgcc/x86_64-pc-linux-gnu/4.1/adainclude"
+    basePath=`echo $gcc/lib/*/*/*`
+    gccCFlags="$gccCFlags -B$basePath -I$basePath/adainclude"
     echo "$gccCFlags" > $out/nix-support/gcc-cflags
 
-    gnatCFlags="-aI$gcc/lib/gnatgcc/x86_64-pc-linux-gnu/4.1/adainclude -aO$gcc/lib/gnatgcc/x86_64-pc-linux-gnu/4.1/adalib"
+    gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
     echo "$gnatCFlags" > $out/nix-support/gnat-cflags
     
     gccPath="$gcc/bin"
diff --git a/pkgs/build-support/gnat-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/gnat-wrapper/gnatlink-wrapper.sh
index 850ba0f83480..25907108b4db 100644
--- a/pkgs/build-support/gnat-wrapper/gnatlink-wrapper.sh
+++ b/pkgs/build-support/gnat-wrapper/gnatlink-wrapper.sh
@@ -1,7 +1,7 @@
 #! @shell@ -e
 
 # Add the flags for the GNAT compiler proper.
-extraAfter="--GCC=@out@/bin/gnatgcc"
+extraAfter="--GCC=@out@/bin/gcc"
 extraBefore=()
 
 # Add the flags that should be passed to the linker (and prevent
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6bdc36b75c7..11e50098945a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1852,13 +1852,6 @@ let
     profiledCompiler = true;
   }));
 
-  gcc44_real2 = lowPrio (wrapGCC (makeOverridable (import
-  ../development/compilers/gcc-4.4-copy) {
-    inherit fetchurl stdenv texinfo gmp mpfr ppl cloogppl
-      gettext which noSysDirs;
-    profiledCompiler = true;
-  }));
-
   gccApple =
     wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc-apple else import ../development/compilers/gcc-apple64) {
       inherit fetchurl stdenv noSysDirs;
@@ -1929,7 +1922,7 @@ let
 
   gnat = gnat44;
 
-  gnat44 = wrapGNAT (gcc44_real2.gcc.override {
+  gnat44 = wrapGNAT (gcc44_real.gcc.override {
     name = "gnat";
     langCC = false;
     langC = true;
@@ -8310,8 +8303,8 @@ let
   };
 
   ghdl = import ../applications/science/electronics/ghdl {
-    inherit fetchurl stdenv;
-    gnat = gnatboot;
+    inherit fetchurl stdenv gnat;
+    gccSrc = gcc43.gcc.src;
   };
 
   ### SCIENCE / MATH