X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/12c49b6a6adbbcb0c7a19119c8a8c94b5f025f79..f66ab6474e8ec7ef0b0db8485b9675ee0bccce5b:/toolchain/gcc/Makefile?ds=sidebyside

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index cd18098e9..a1d1baa40 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -59,6 +59,9 @@ define Stage1/Configure
 		--with-gnu-ld \
 		--disable-nls \
 		--disable-libmudflap \
+		--disable-multilib \
+		$(SOFT_FLOAT_CONFIG_OPTION) \
+		$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
 	);
 endef
 define Stage1/Compile
@@ -89,13 +92,14 @@ define Stage2/Configure
 		--with-gnu-ld \
 		--disable-nls \
 		--disable-libmudflap \
+		--disable-multilib \
+		$(SOFT_FLOAT_CONFIG_OPTION) \
+		$(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