* Add the statically linked GCC.

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

pkgs/stdenv/linux/make-bootstrap-tools.nix

@@ -7,14 +7,22 @@ let
     # stdenv-linux's dependencies, rather than building new ones with
     # dietlibc.
     bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv)
-      ["binutils" "coreutils" "gnused" "gnugrep" "gnutar" "gzip" "bzip2" "bash" "patch" "patchelf"];
+      ["binutils" "gcc" "coreutils" "gnused" "gnugrep" "gnutar" "gzip" "bzip2" "bash" "patch" "patchelf"];
   };
 
   generator = pkgs.stdenv.mkDerivation {
     name = "bootstrap-tools-generator";
     builder = ./make-bootstrap-tools.sh;
+    
     inherit (pkgsDiet) coreutils gnused gnugrep gnutar gzip bzip2 bash patch;
     binutils = pkgsDiet.binutils;
+    
+    gcc = import ../../development/compilers/gcc-static-4.1 {
+      inherit (pkgs) fetchurl stdenv;
+      profiledCompiler = false;
+      langCC = false;
+    };
+  
     curl = pkgsDiet.realCurl;
 
     # The result should not contain any references (store paths) so