# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1164752984 18000
# Node ID 6cd344d090de90e70c0ad9cbef75247fb81028bd
# Parent  0068264ad65a7a376cef9fd1813e3e8596199342
Switch in make headers_install, fix the uclibc cleanup stage to actually work,
and remove the changes to the gcc source (getting gcc to try sane paths is
a  lost cause, I'm going to try the wrapper script instead).

diff -r 0068264ad65a -r 6cd344d090de build.sh
--- a/build.sh	Tue Nov 28 16:15:07 2006 -0500
+++ b/build.sh	Tue Nov 28 17:29:44 2006 -0500
@@ -77,18 +77,8 @@
 
 export STAGE=build-cross
 
-echo === Install linux-headers.
-
-setupfor linux-headers
-#cd "${WORK}"
-#tar xvjf "${SOURCES}"/build-cross/linux-headers.tar.bz2 &&
-#cd linux-headers* &&
-mkdir "${CROSS}"/include &&
-mv include/asm-${ARCH} "${CROSS}"/include/asm &&
-mv include/asm-generic "${CROSS}"/include &&
-mv include/linux "${CROSS}"/include &&
-cd ..
-rm -rf linux-headers*
+setupfor linux
+make headers_install ARCH="${ARCH}" INSTALL_HDR_PATH="${CROSS}"
 
 [ $? -ne 0 ] && dienow
 
@@ -106,13 +96,6 @@
 [ $? -ne 0 ] && dienow
 
 setupfor gcc-core build-gcc gcc-
-# Remove /usr/libexec/gcc and /usr/lib/gcc from gcc's search path.  (Don't grab
-# random host libraries when cross-compiling, it's not polite.)
-sed -ie 's/standard_exec_prefix_//;T;N;d' "${CURSRC}/gcc/gcc.c" &&
-# Adjust StartFile Spec to point to cross libraries.
-echo -e "\n#undef STARTFILE_PREFIX_SPEC\n#define STARTFILE_PREFIX_SPEC \"${CROSS}/lib/\"" >> ../gcc-*/gcc/config/linux.h &&
-# Adjust preprocessor's default search path
-sed -ire "s@(^CROSS_SYSTEM_HEADER_DIR =).*@\1 ${CROSS}/include@g" ../gcc-*/gcc/Makefile.in &&
 "${CURSRC}/configure" --prefix="${CROSS}" --host=${CROSS_HOST} \
 	--target=${CROSS_TARGET} --with-local-prefix="${CROSS}" \
 	--disable-multilib --disable-nls --disable-shared --disable-threads \
@@ -135,6 +118,6 @@
 make RUNTIME_PREFIX="${CROSS}" DEVEL_PREFIX="${CROSS}" \
 	install_runtime install_dev &&
 cd .. &&
-rm -rf uClibc
+rm -rf uClibc-*
 
 [ $? -ne 0 ] && dienow