Fix the imagebuilder generation (does not mean it works with the recent changes)

[openwrt.git] / toolchain / gcc / Makefile

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index cd18098..a326bb7 100644 (file)
--- 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,7 @@ define Stage1/Configure
                --with-gnu-ld \
                --disable-nls \
                --disable-libmudflap \
+               --disable-multilib \
        );
 endef
 define Stage1/Compile
@@ -89,13 +90,12 @@ define Stage2/Configure
                --with-gnu-ld \
                --disable-nls \
                --disable-libmudflap \
+               --disable-multilib \
        );
 endef
 
 define Stage2/Compile
-       $(MAKE) -C $(BUILD_DIR2) \
-               SHELL="$(BASH)" \
-               all
+       export SHELL="\$(BASH)"; \$(MAKE) -C \$(BUILD_DIR2) all
 endef
 
 define Stage2/Install