X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fhost.mk;h=b6a58248fdb79f332ea9e60fc0bbf633469f3744;hb=555b1af398c2b808d93a2e93699bce8dcd2b917a;hp=00eb1f55aafef0a1072e0dfa07b4071eaee5aa86;hpb=d3c61e4ff72b3acbc2da12f726339dc60545d1b4;p=openwrt-10.03%2F.git diff --git a/include/host.mk b/include/host.mk index 00eb1f55a..b6a58248f 100644 --- a/include/host.mk +++ b/include/host.mk @@ -8,7 +8,7 @@ TMP_DIR ?= $(TOPDIR)/tmp -include $(TMP_DIR)/.host.mk -export TAR +export TAR FIND ifneq ($(__host_inc),1) __host_inc:=1 @@ -34,17 +34,16 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk [ -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)' >>$@; \ + 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' >> $@; \ + echo "FIND_L=$$FIND \$$(1) -follow" >> $@; \ + fi; \ + if xargs --help 2>&1 | grep 'gnu.org' >/dev/null; then \ + echo 'XARGS:=xargs -r' >> $@; \ + else \ + echo 'XARGS:=xargs' >> $@; \ fi; \ ) endif - -ifeq ($(HOST_OS),Linux) - XARGS:=xargs -r -else - XARGS:=xargs -endif