X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f52d66ff00b24111f87c274d3d7085ef2e1d27b1..097a96122951f9a8dfe5eb051f021e7c3d82c373:/include/host.mk diff --git a/include/host.mk b/include/host.mk index 3a5fd9683..00eb1f55a 100644 --- a/include/host.mk +++ b/include/host.mk @@ -1,15 +1,20 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -include $(TOPDIR)/.host.mk +TMP_DIR ?= $(TOPDIR)/tmp +-include $(TMP_DIR)/.host.mk export TAR -$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk +ifneq ($(__host_inc),1) +__host_inc:=1 +.PRECIOUS: $(TMP_DIR)/.host.mk +$(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk + @mkdir -p $(TMP_DIR) @( \ HOST_OS=`uname`; \ case "$$HOST_OS" in \ @@ -22,10 +27,24 @@ $(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 tar | head -n 1`; \ + TAR=`which gtar 2>/dev/null`; \ + [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \ echo "TAR:=$$TAR" >> $@; \ + FIND=`which gfind 2>/dev/null`; \ + [ -n "$$FIND" -a -x "$$FIND" ] || FIND=`which find 2>/dev/null`; \ + echo "FIND:=$$FIND" >> $@; \ + echo "BASH:=$(shell which bash)" >> $@; \ + if find -L /tmp -maxdepth 0 >/dev/null 2>/dev/null; then \ + echo 'FIND_L=find -L $$(1)' >>$@; \ + else \ + echo 'FIND_L=find $$(1) -follow' >> $@; \ + fi; \ ) +endif + +ifeq ($(HOST_OS),Linux) + XARGS:=xargs -r +else + XARGS:=xargs +endif