From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 12 Nov 2006 02:45:13 +0000 (+0000)
Subject: more shell related fixes
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=4134d3b68a6053d2923b175c51f38a771a295403

more shell related fixes

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5509 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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; \
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 21f56ea57..05ee49be3 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -29,7 +29,7 @@ define Build/Configure
 	-$(CP) ./files/config.$(LINUX_KARCH) $(PKG_BUILD_DIR)/.config
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		ARCH=$(LINUX_KARCH) \
-		CONFIG_SHELL=$(shell which bash) \
+		CONFIG_SHELL=$(BASH) \
 		defconfig include/linux/version.h
 endef
 
diff --git a/tools/sed/Makefile b/tools/sed/Makefile
index 61c7acbb0..94c59c824 100644
--- a/tools/sed/Makefile
+++ b/tools/sed/Makefile
@@ -18,10 +18,9 @@ PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-override SHELL:=$(BASH)
-
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+		SHELL="$(BASH)" \
 		./configure \
 		--prefix=$(STAGING_DIR) \
 		--prefix=/usr \
@@ -29,7 +28,7 @@ define Build/Configure
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) SHELL="$(BASH)"
 endef
 
 define Build/Install