X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/fa8f555b9dc6b1476a806acc191a58241875a7ea..b0c483b0b13f0b696bf52b5d9eaa5a5e3c49f090:/include/host.mk?ds=sidebyside diff --git a/include/host.mk b/include/host.mk index abcf045d0..4a434711c 100644 --- a/include/host.mk +++ b/include/host.mk @@ -5,9 +5,12 @@ # See /LICENSE for more information. # -include $(TOPDIR)/.host.mk +include $(TMP_DIR)/.host.mk -$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk +export TAR + +$(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk + @mkdir -p $(TMP_DIR) @( \ HOST_OS=`uname`; \ case "$$HOST_OS" in \ @@ -20,8 +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" >> $@; \ - if tar --version 2>&1 | grep 'GNU' >/dev/null; then \ - echo "TAR_WILDCARDS:=--wildcards" >> $@; \ - fi; \ + TAR=`which gtar 2>/dev/null`; \ + [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \ + echo "TAR:=$$TAR" >> $@; \ + 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)" >> $@; \ )