From 9c611a19c63a54c69189ab428975854630a9a549 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Oct 2006 09:51:32 +0000 Subject: [PATCH] * Glibc no longer containing profiling libraries. * GCC no longer does a multilib build. svn path=/nixpkgs/trunk/; revision=6842 --- pkgs/stdenv/linux/make-bootstrap-tools.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.sh b/pkgs/stdenv/linux/make-bootstrap-tools.sh index 1cf0df1c255..838c507d575 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/make-bootstrap-tools.sh @@ -81,7 +81,9 @@ 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* -nukeRefs gcc/lib/libgcc_s.so.1 +if test -e gcc/lib/libgcc_s.so.1; then + nukeRefs gcc/lib/libgcc_s.so.1 +fi if test -e $gcc/lib64; then cp -prd $gcc/lib64 gcc chmod -R +w gcc/lib64 @@ -96,7 +98,7 @@ rm -rf gcc/lib/gcc/*/*/include/linux mkdir glibc mkdir glibc/lib cp $glibc/lib/*.a glibc/lib -rm glibc/lib/*_p.a +rm -f glibc/lib/*_p.a nukeRefs glibc/lib/libc.a cp $glibc/lib/*.o glibc/lib cp -prd $glibc/include glibc