X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fhost.mk;h=4a434711c3c8649c259cb3826aacb53fd9547c8d;hb=4c249cccc21492f45340a177c241551213bf6a6c;hp=3100ce4165a32150d24e3863fa58a49048b1930d;hpb=cdd54ec2648c43c6d8955a865df69c28a71e7c76;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/include/host.mk b/include/host.mk index 3100ce4165..4a434711c3 100644 --- a/include/host.mk +++ b/include/host.mk @@ -5,11 +5,12 @@ # See /LICENSE for more information. # -include $(TOPDIR)/.host.mk +include $(TMP_DIR)/.host.mk export TAR -$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk +$(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk + @mkdir -p $(TMP_DIR) @( \ HOST_OS=`uname`; \ case "$$HOST_OS" in \ @@ -22,11 +23,12 @@ $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk echo "HOST_OS:=$$HOST_OS" > $@; \ echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \ echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \ - TAR=`which gtar`; \ - [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar`; \ + TAR=`which gtar 2>/dev/null`; \ + [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \ echo "TAR:=$$TAR" >> $@; \ - ZCAT=`which gzcat`; \ - [ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat`; \ + ZCAT=`which gzcat 2>/dev/null`; \ + [ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat 2>/dev/null`; \ echo "ZCAT:=$$ZCAT" >> $@; \ + echo "BASH:=$(shell which bash)" >> $@; \ )