From a5d910833e66d5810fd869dc27bd7a638ea525fe Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 14 Nov 2002 09:06:52 +0000
Subject: [PATCH] Fixup gcc-target so it actually works...

---
 make/gcc_target.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/make/gcc_target.mk b/make/gcc_target.mk
index 1d8c9fbd55..48030efa60 100644
--- a/make/gcc_target.mk
+++ b/make/gcc_target.mk
@@ -44,6 +44,11 @@ GCC_BUILD_DIR3:=$(BUILD_DIR)/gcc-target
 #############################################################
 $(BINUTILS_DIR2)/.configured:
 	mkdir -p $(BINUTILS_DIR2)
+	mkdir -p $(TARGET_DIR)/usr/include
+	mkdir -p $(TARGET_DIR)/usr/$(GNU_TARGET_NAME)/
+	#(cd $(TARGET_DIR)/usr/$(GNU_TARGET_NAME); ln -fs ../lib)
+	#(cd $(TARGET_DIR)/usr/$(GNU_TARGET_NAME); ln -fs ../include)
+	(cd $(TARGET_DIR)/usr/$(GNU_TARGET_NAME); ln -fs ../include sys-include)
 	(cd $(BINUTILS_DIR2); PATH=$$PATH:$(STAGING_DIR)/bin CC=$(TARGET_CROSS)gcc \
 		$(BINUTILS_DIR)/configure --enable-shared \
 		--target=$(GNU_TARGET_NAME) --prefix=/usr \
@@ -106,9 +111,12 @@ $(GCC_BUILD_DIR3)/.configured:
 	(cd $(GCC_BUILD_DIR3); PATH=$$PATH:$(STAGING_DIR)/bin AR=$(TARGET_CROSS)ar \
 		RANLIB=$(TARGET_CROSS)ranlib LD=$(TARGET_CROSS)ld CC=$(TARGET_CROSS)gcc \
 		$(GCC_DIR)/configure \
-		--target=$(GNU_TARGET_NAME) --prefix=/usr --includedir=$(STAGING_DIR) \
+		--host=$(GNU_TARGET_NAME) --target=$(GNU_TARGET_NAME) --prefix=/usr \
+		--with-local-prefix=$(STAGING_DIR)/usr \
 		--enable-target-optspace --disable-nls --with-gnu-ld \
 		--enable-shared --enable-languages=c,c++ );
+	perl -i -p -e "s,ac_cv_prog_cc_cross=no,ac_cv_prog_cc_cross=yes,g;" $(GCC_BUILD_DIR3)/config.cache
+	perl -i -p -e "s,^build_tooldir=no,ac_cv_prog_cc_cross=yes,g;" $(GCC_BUILD_DIR3)/config.cache
 	touch $(GCC_BUILD_DIR3)/.configured
 
 $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured
-- 
2.30.2