Make should be using the bash shell by default which makes
CONFIG_SHELL unnecessary
Signed-off-by: Peter Tyser <[EMAIL PROTECTED]>
---
I noticed this after submitting "Use bash for default GNU
Make shell application", let me know if I should
roll both these into 1 patch.
This patch needs to be applied on top of "Use bash for
default GNU Make shell application".
Makefile | 3 +--
config.mk | 9 ++-------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index cf82551..ec32fba 100644
--- a/Makefile
+++ b/Makefile
@@ -372,8 +372,7 @@ $(U_BOOT_ONENAND): $(ONENAND_IPL) $(obj)u-boot.bin
$(obj)include/autoconf.mk
$(VERSION_FILE):
@( printf '#define U_BOOT_VERSION "U-Boot %s%s"\n'
"$(U_BOOT_VERSION)" \
- '$(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion
$(TOPDIR))' \
- ) > [EMAIL PROTECTED]
+ '$(shell $(TOPDIR)/tools/setlocalversion $(TOPDIR))' ) >
[EMAIL PROTECTED]
@cmp -s $@ [EMAIL PROTECTED] && rm -f [EMAIL PROTECTED] || mv
-f [EMAIL PROTECTED] $@
gdbtools:
diff --git a/config.mk b/config.mk
index 5a9334c..bd813f1 100644
--- a/config.mk
+++ b/config.mk
@@ -46,10 +46,6 @@ PLATFORM_LDFLAGS =
#########################################################################
-CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
- else if [ -x /bin/bash ]; then echo /bin/bash; \
- else echo sh; fi ; fi)
-
ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
HOSTCC = cc
else
@@ -204,9 +200,8 @@ endif
#########################################################################
-export CONFIG_SHELL HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE \
- AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP \
- MAKE
+export HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC CPP AR NM STRIP \
+ OBJCOPY OBJDUMP MAKE
export TEXT_BASE PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS
#########################################################################
--
1.6.0.2.GIT
_______________________________________________
U-Boot mailing list
[email protected]
http://lists.denx.de/mailman/listinfo/u-boot
