X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fhost.mk;h=4a434711c3c8649c259cb3826aacb53fd9547c8d;hb=c41fbbc115a5f16a61cf16419a8fe70ab5d00bdd;hp=11522184b7ce7f72240493a7b189ed8d229161c9;hpb=f5ccb55568d088351322c5827b66767167802689;p=openwrt-10.03%2F.git diff --git a/include/host.mk b/include/host.mk index 11522184b..4a434711c 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" >> $@; \ - if $$TAR --version 2>&1 | grep 'GNU' >/dev/null; then \ - echo "TAR_WILDCARDS:=--wildcards" >> $@; \ - fi; \ + 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)" >> $@; \ )