summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-10 19:55:54 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-10 19:55:54 +0000
commit27c68c3f75771f74d66d70db613992b63b7fd1b9 (patch)
treec5713d012c904fe035d35c5e0b91da222099c138
parentf9b2e6769fa4edb2a74e87647b62e10820ab6ced (diff)
fix gcc compile
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5032 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--rules.mk4
-rw-r--r--toolchain/gcc/Makefile1
2 files changed, 4 insertions, 1 deletions
diff --git a/rules.mk b/rules.mk
index 8e5294edb..b9859dbd3 100644
--- a/rules.mk
+++ b/rules.mk
@@ -8,7 +8,9 @@
-include $(TOPDIR)/.config
include $(TOPDIR)/include/verbose.mk
-export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' --
+export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' --
+export BASH=$(shell which bash)
+
ARCH:=$(strip $(subst ",, $(CONFIG_ARCH)))
TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION)))
WGET:=$(strip $(subst ",, $(CONFIG_WGET)))
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 8a2337593..7ef6005d0 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -45,6 +45,7 @@ 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)