From d91c216e2cefa4484cedb23685ad73e6bd7dcc35 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Jul 2004 12:20:23 +0000
Subject: [PATCH] * Include gcc 3.4.x in the nixpkgs release. * Remove
 precompiled headers, which are nice except that   A) they don't work; and  
 B) they make gcc take up 270% more disk space.

svn path=/nixpkgs/trunk/; revision=1129
---
 pkgs/development/compilers/gcc-3.4/builder.sh | 9 ++++++++-
 pkgs/system/all-packages-generic.nix          | 2 +-
 pkgs/system/populate-cache.nix                | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc-3.4/builder.sh b/pkgs/development/compilers/gcc-3.4/builder.sh
index a49eb03cbd13..2d425eabc73a 100644
--- a/pkgs/development/compilers/gcc-3.4/builder.sh
+++ b/pkgs/development/compilers/gcc-3.4/builder.sh
@@ -45,6 +45,7 @@ else
 fi
 
 
+preConfigure=preConfigure
 preConfigure() {
     
     # Determine the frontends to build.
@@ -64,7 +65,13 @@ preConfigure() {
     configureFlags="--enable-languages=$langs"
 }
 
-preConfigure=preConfigure
+
+postInstall=postInstall
+postInstall() {
+    # Remove precompiled headers for now.  They are very big and
+    # probably not very useful yet.
+    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
+}
 
 
 if test -z "$profiledCompiler"; then
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 39c23209da6c..d72bed1d1e59 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -206,7 +206,7 @@ rec {
     inherit fetchurl stdenv noSysDirs;
   };
 
-  gcc340 = (import ../build-support/gcc-wrapper) {
+  gcc34 = (import ../build-support/gcc-wrapper) {
     nativeTools = false;
     nativeGlibc = false;
     gcc = (import ../development/compilers/gcc-3.4) {
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 91d1bd07271c..1af98e8e122f 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -29,6 +29,7 @@ let {
     bisonnew
     flexnew
     gcc
+    gcc34
     aterm
     strategoxt
     ghc