From 50f337ad010557252387619a4b15ea1143f528e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 5 Aug 2010 13:39:08 +0000
Subject: [PATCH] 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 | 8 ++++++++
 pkgs/development/libraries/gmp/4.nix          | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc-4.5/builder.sh b/pkgs/development/compilers/gcc-4.5/builder.sh
index adcb03ef4dd7..fd9b4bd4534b 100644
--- a/pkgs/development/compilers/gcc-4.5/builder.sh
+++ b/pkgs/development/compilers/gcc-4.5/builder.sh
@@ -181,6 +181,14 @@ postInstall() {
     # previous gcc.
     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
diff --git a/pkgs/development/libraries/gmp/4.nix b/pkgs/development/libraries/gmp/4.nix
index 198fe15deeac..c5a59045bbe9 100644
--- a/pkgs/development/libraries/gmp/4.nix
+++ b/pkgs/development/libraries/gmp/4.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
 
   dontDisableStatic = if static then true else false;
 
-
   doCheck = true;
 
   meta = {