* GCC 3.4: pass --disable-multilib to make it build on x86_64.

svn path=/nixpkgs/trunk/; revision=9704

2 files changed, 18 insertions, 13 deletions

diff --git a/pkgs/development/compilers/gcc-3.4/builder.sh b/pkgs/development/compilers/gcc-3.4/builder.sh
index 5a89201377d..eb1f211dce8 100644
--- a/pkgs/development/compilers/gcc-3.4/builder.sh
+++ b/pkgs/development/compilers/gcc-3.4/builder.sh
@@ -37,22 +37,10 @@ fi
 
 preConfigure=preConfigure
 preConfigure() {
-    
-    # Determine the frontends to build.
-    langs="c"
-    if test -n "$langCC"; then
-        langs="$langs,c++"
-    fi
-    if test -n "$langF77"; then
-        langs="$langs,f77"
-    fi
-
     # Perform the build in a different directory.
     mkdir ../build
     cd ../build
-
     configureScript=../$sourceRoot/configure
-    configureFlags="--enable-languages=$langs $configureFlags"
 }
 
 
diff --git a/pkgs/development/compilers/gcc-3.4/default.nix b/pkgs/development/compilers/gcc-3.4/default.nix
index 4cb834304e3..de7f079b2d9 100644
--- a/pkgs/development/compilers/gcc-3.4/default.nix
+++ b/pkgs/development/compilers/gcc-3.4/default.nix
@@ -5,6 +5,8 @@
 
 assert langC;
 
+with import ../../../lib;
+
 stdenv.mkDerivation {
   name = "gcc-3.4.6";
   builder = ./builder.sh;
@@ -15,7 +17,22 @@ stdenv.mkDerivation {
 
   patches = if noSysDirs then [./no-sys-dirs.patch] else [];
 
-  inherit noSysDirs langC langCC langF77 profiledCompiler;
+  inherit noSysDirs profiledCompiler;
+
+  configureFlags = "
+    --disable-multilib
+    --with-system-zlib
+    --enable-languages=${
+      concatStrings (intersperse ","
+        (  optional langC   "c"
+        ++ optional langCC  "c++"
+        ++ optional langF77 "f77"
+        )
+      )
+    }
+  ";
+
+  passthru = { inherit langC langCC langF77; };
 
   meta = {
     homepage = "http://gcc.gnu.org/";