From 1a060e3b81c46ef762daef3c0c0a796e36d262db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 23 Oct 2006 21:52:36 +0000
Subject: [PATCH] * x86_64 changes.

svn path=/nixpkgs/trunk/; revision=6814
---
 pkgs/stdenv/linux/make-bootstrap-tools.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.sh b/pkgs/stdenv/linux/make-bootstrap-tools.sh
index b01dee3933b..3b1ecbbceef 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.sh
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.sh
@@ -83,9 +83,13 @@ cp -prd $gcc/libexec gcc
 chmod -R +w gcc
 nukeRefs gcc/libexec/gcc/*/*/cc1
 nukeRefs gcc/libexec/gcc/*/*/collect2
-rm gcc/lib/libmud* gcc/lib/libiberty* gcc/lib/libssp*
-nukeRefs gcc/lib/libgcc_s.so.1
+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
 rm -rf gcc/lib/gcc/*/*/install-tools
+rm -rf gcc/lib/gcc/*/*/include/root
+rm -rf gcc/lib/gcc/*/*/include/linux
 
 
 # Create the glibc tarball.