Making gcc not depend on bootstrap-tools (by a postInstall patchelf trick)

svn path=/nixpkgs/branches/stdenv-updates/; revision=22963

pkgs/development/compilers/gcc-4.5/builder.sh

@@ -182,6 +182,14 @@ postInstall() {
     rm -rf $out/libexec/gcc/*/*/install-tools
     rm -rf $out/lib/gcc/*/*/install-tools
     
+    # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
+    rm -rf $out/bin/gccbug
+    # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
+    for i in $out/libexec/gcc/*/*/*; do
+        PREV_RPATH=`patchelf --print-rpath $i`
+        patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i
+    done
+
     # Get rid of some "fixed" header files
     rm -rf $out/lib/gcc/*/*/include/root
 

pkgs/development/libraries/gmp/4.nix

@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
 
   dontDisableStatic = if static then true else false;
 
-
   doCheck = true;
 
   meta = {