X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/edc76f93c20e4ed2e76230d163dadda7aeb00927..d41785f952ae44e3be76180ca4ba839187492c87:/toolchain/gcc/Makefile?ds=inline

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index bae9220f0..d9e34af0b 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,6 +91,8 @@ define Stage2/Configure
 		--with-gnu-ld \
 		--disable-nls \
 		--disable-libmudflap \
+		--disable-multilib \
+		$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
 	);
 endef