X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4134d3b68a6053d2923b175c51f38a771a295403..0a85e0db3e064966d3b5b68dd977c52d2724bf23:/toolchain/gcc/Makefile

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index af06e8a4c..60fca50fb 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -64,10 +64,10 @@ define Stage1/Configure
 	);
 endef
 define Stage1/Compile
-	$(MAKE) -C $(BUILD_DIR1) all-gcc SHELL="$(BASH)"
+	export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) all-gcc
 endef
 define Stage1/Install
-	$(MAKE) -C $(BUILD_DIR1) install-gcc SHELL="$(BASH)"
+	export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) install-gcc
 endef
 
 define Stage2/Configure
@@ -93,10 +93,10 @@ define Stage2/Configure
 	);
 endef
 define Stage2/Compile
-	$(MAKE) -C $(BUILD_DIR2) all SHELL="$(BASH)"
+	export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR2) all
 endef
 define Stage2/Install
-	$(MAKE) -C $(BUILD_DIR2) install SHELL="$(BASH)"
+	export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR2) install
 	echo $(PKG_VERSION) > $(STAGING_DIR)/gcc_version
 	# Set up the symlinks to enable lying about target name.
 	set -e; \
@@ -115,6 +115,7 @@ define Build/Prepare
 	$(SCRIPT_DIR)/patch-kernel.sh $(PKG_BUILD_DIR) ./patches/$(PKG_VERSION) \*.patch
 	$(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(PKG_BUILD_DIR)/gcc/version.c
 	$(SED) 's,\(bug_report_url.. = "\).*\(";\),\1<URL:https://dev.openwrt.org/>\2,' $(PKG_BUILD_DIR)/gcc/version.c
+	(cd $(PKG_BUILD_DIR)/libstdc++-v3; autoconf;);
 endef
 
 define Build/Configure