From 4134d3b68a6053d2923b175c51f38a771a295403 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 12 Nov 2006 02:45:13 +0000
Subject: more shell related fixes

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5509 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 toolchain/gcc/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'toolchain/gcc')

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 7ef6005d0..af06e8a4c 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -45,11 +45,10 @@ include $(INCLUDE_DIR)/host-build.mk
 BUILD_DIR1:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-initial
 BUILD_DIR2:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-final
 
-override SHELL:=$(BASH)
-
 define Stage1/Configure
 	mkdir -p $(BUILD_DIR1)
 	(cd $(BUILD_DIR1); rm -f config.cache; \
+		SHELL="$(BASH)" \
 		$(PKG_BUILD_DIR)/configure \
 		--prefix=$(STAGING_DIR) \
 		--build=$(GNU_HOST_NAME) \
@@ -65,10 +64,10 @@ define Stage1/Configure
 	);
 endef
 define Stage1/Compile
-	$(MAKE) -C $(BUILD_DIR1) all-gcc
+	$(MAKE) -C $(BUILD_DIR1) all-gcc SHELL="$(BASH)"
 endef
 define Stage1/Install
-	$(MAKE) -C $(BUILD_DIR1) install-gcc
+	$(MAKE) -C $(BUILD_DIR1) install-gcc SHELL="$(BASH)"
 endef
 
 define Stage2/Configure
@@ -79,6 +78,7 @@ define Stage2/Configure
 	rm -rf $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
 	ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
 	(cd $(BUILD_DIR2); rm -f config.cache; \
+		SHELL="$(BASH)" \
 		$(PKG_BUILD_DIR)/configure \
 		--prefix=$(STAGING_DIR) \
 		--build=$(GNU_HOST_NAME) \
@@ -93,10 +93,10 @@ define Stage2/Configure
 	);
 endef
 define Stage2/Compile
-	$(MAKE) -C $(BUILD_DIR2) all
+	$(MAKE) -C $(BUILD_DIR2) all SHELL="$(BASH)"
 endef
 define Stage2/Install
-	$(MAKE) -C $(BUILD_DIR2) install
+	$(MAKE) -C $(BUILD_DIR2) install SHELL="$(BASH)"
 	echo $(PKG_VERSION) > $(STAGING_DIR)/gcc_version
 	# Set up the symlinks to enable lying about target name.
 	set -e; \
-- 
cgit v1.2.3