X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FMakefile;h=d9e34af0bd03716ce9ed3d7d2257937b5a6461c0;hp=cd18098e9fb5d2cc4aaa1e9f1cf8e0d40dfa41d1;hb=81bc08344aa3cf1a4865d5645eb3a0cf259cc319;hpb=77370d6b515d6db4e2152d4408fabdf5116a95a2

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index cd18098e9f..d9e34af0bd 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -33,7 +33,7 @@ BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed
+STAMP_BUILT:=$(STAGING_DIR)/stamp/.gcc-initial_installed
 BUILD_DIR1:=$(BUILD_DIR_HOST)/gcc-$(PKG_VERSION)-initial
 BUILD_DIR2:=$(BUILD_DIR_HOST)/gcc-$(PKG_VERSION)-final
 
@@ -59,6 +59,8 @@ define Stage1/Configure
 		--with-gnu-ld \
 		--disable-nls \
 		--disable-libmudflap \
+		--disable-multilib \
+		$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
 	);
 endef
 define Stage1/Compile
@@ -89,13 +91,13 @@ define Stage2/Configure
 		--with-gnu-ld \
 		--disable-nls \
 		--disable-libmudflap \
+		--disable-multilib \
+		$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
 	);
 endef
 
 define Stage2/Compile
-	$(MAKE) -C $(BUILD_DIR2) \
-		SHELL="$(BASH)" \
-		all
+	export SHELL="\$(BASH)"; \$(MAKE) -C \$(BUILD_DIR2) all
 endef
 
 define Stage2/Install