* Fix static linking in gcc.

* Use the coreutils in dietlibc.
* Add objdump to the binutils static tarball.

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

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

@@ -23,20 +23,16 @@ let
   generator = pkgs.stdenv.mkDerivation {
     name = "bootstrap-tools-generator";
     builder = ./make-bootstrap-tools.sh;
-    
+
     inherit (pkgsDiet)
-      gnugrep gzip bzip2 gnumake bash patch binutils;
+      coreutils findutils diffutils gnugrep
+      gzip bzip2 gnumake bash patch binutils;
       
     gnused = pkgsDiet.gnused412; # 4.1.5 gives "Memory exhausted" errors
 
     # patchelf is C++, won't work with dietlibc.
     inherit (pkgsStatic) patchelf;
 
-    # Coreutils won't build on dietlibc on x86_64 (and by extension,
-    # findutils and diffutils).
-    inherit (if pkgs.stdenv.system == "powerpc-linux" then pkgsStatic else pkgsDiet)
-      coreutils findutils diffutils;
-
     gnutar =
       # Tar seems to be broken on dietlibc on x86_64.
       if pkgs.stdenv.system == "i686-linux"
@@ -50,10 +46,9 @@ let
       then pkgsDiet.gawk
       else pkgsStatic.gawk;
       
-    gcc = import ../../development/compilers/gcc-4.1 {
+    gcc = import ../../development/compilers/gcc-4.1-temp {
       inherit (pkgs) fetchurl stdenv;
       noSysDirs = true;
-      profiledCompiler = true;
       langCC = false;
       staticCompiler = true;
     };

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

@@ -72,7 +72,7 @@ fi
 # Create the binutils tarball.
 mkdir binutils
 mkdir binutils/bin
-for i in as ld ar ranlib nm strip readelf; do
+for i in as ld ar ranlib nm strip readelf objdump; do
     cp $binutils/bin/$i binutils/bin
     nukeRefs binutils/bin/$i
 done
@@ -150,3 +150,9 @@ done
 for i in $out/in-nixpkgs/*.bz2; do
     (cd $out/check-only && bunzip2 < $i > $(basename $i .bz2))
 done
+
+
+# Check that everything is statically linked
+for i in $(find $out -type x); do
+    ldd $i
+done