From: Felix Fietkau Date: Wed, 10 Jul 2013 15:11:29 +0000 (+0000) Subject: build: move the XARGS variable out of the host checks, since a working xargs is built... X-Git-Tag: reboot~9978 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1c742fb388d8c6f94969c73fe403e442d0022c1a;p=oweals%2Fopenwrt.git build: move the XARGS variable out of the host checks, since a working xargs is built in tools/ Signed-off-by: Felix Fietkau SVN-Revision: 37228 --- diff --git a/include/host.mk b/include/host.mk index b44c1bf1ac..000fb18984 100644 --- a/include/host.mk +++ b/include/host.mk @@ -54,11 +54,6 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk else \ 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; \ PATCH=`which gpatch 2>/dev/null`; \ [ -n "$$PATCH" -a -x "$$PATCH" ] || PATCH=`which patch 2>/dev/null`; \ echo "PATCH:=$$PATCH" >> $@; \ diff --git a/rules.mk b/rules.mk index 6a283bd647..2e9e20d919 100644 --- a/rules.mk +++ b/rules.mk @@ -207,6 +207,7 @@ KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh SED:=$(STAGING_DIR_HOST)/bin/sed -i -e CP:=cp -fpR LN:=ln -sf +XARGS:=xargs -r INSTALL_BIN:=install -m0755 INSTALL_DIR:=install -d -m0755