X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/00ff299f672bb198eaf876e395e4bb683b26fa93..fb8b4548a0193022e19c6c920d925fd9c8d73343:/include/host.mk?ds=sidebyside diff --git a/include/host.mk b/include/host.mk index 1130d5b9a..4a434711c 100644 --- a/include/host.mk +++ b/include/host.mk @@ -9,9 +9,9 @@ include $(TMP_DIR)/.host.mk export TAR -$(TMP_DIR)/.host.mk: $(INCLUDE_DIR)/host.mk +$(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk + @mkdir -p $(TMP_DIR) @( \ - echo -n "BASH:=$(shell which bash)"; \ HOST_OS=`uname`; \ case "$$HOST_OS" in \ Linux) HOST_ARCH=`uname -m`;; \ @@ -23,11 +23,12 @@ $(TMP_DIR)/.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)" >> $@; \ )