* Build a static GCC, properly. (Reminder: when building GCC on an

impure x86_64 environment, make sure that the 32-bit GCC / Glibc
  libraries are installed, such as /usr/lib/crti.o.)

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

pkgs/stdenv/linux/bootstrap/x86_64/default.nix

@@ -7,21 +7,21 @@
 
   staticToolsURL = {
     url = file:///tmp/tarballs/static-tools.tar.bz2;
-    sha1 = "806f9644bf155069315bdd66138764b3d8619348";
+    sha1 = "4c72845335b373966341f1d4ca0b4b06904d1214";
   };
 
   binutilsURL = {
     url = file:///tmp/tarballs/binutils.tar.bz2;
-    sha1 = "b55055c50cfcd2ab02e20f49ad8ca72315252a1c";
+    sha1 = "5ad0bdf99a427ebb8e08ca90db952c3eeb5119a4";
   };
 
   gccURL = {
     url = file:///tmp/tarballs/gcc.tar.bz2;
-    sha1 = "a2ac17b6e7ce6d07c01e090b801c1622f56d8b39";
+    sha1 = "7398e021fdd5d7c4b5a3bb158db6e7573fc1dc0f";
   };
 
   glibcURL = {
     url = file:///tmp/tarballs/glibc.tar.bz2;
-    sha1 = "59d4d5a25ecd8b2f741d80e80d172bd6e7e06d89";
+    sha1 = "710b4a53425977858490f77188c7e2138b55a2dd";
   };
 }

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

@@ -43,7 +43,7 @@ let
     binutils = pkgsDiet.binutils217;
    
     gcc = import ../../development/compilers/gcc-static-4.1 {
-      inherit (pkgs) fetchurl stdenv glibc;
+      inherit (pkgs) fetchurl stdenv;
       profiledCompiler = false;
       langCC = false;
     };

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

@@ -84,9 +84,7 @@ chmod -R +w gcc
 nukeRefs gcc/libexec/gcc/*/*/cc1
 nukeRefs gcc/libexec/gcc/*/*/collect2
 rm -f gcc/lib/libmud* gcc/lib/libiberty* gcc/lib/libssp*
-if test -e gcc/lib/libgcc_s.so.1; then
-    nukeRefs gcc/lib/libgcc_s.so.1
-fi
+nukeRefs gcc/lib/libgcc_s.so.1
 rm -rf gcc/lib/gcc/*/*/install-tools
 rm -rf gcc/lib/gcc/*/*/include/root
 rm -rf gcc/lib/gcc/*/*/include/linux