build: move the XARGS variable out of the host checks, since a working xargs is built...
authorFelix Fietkau <nbd@openwrt.org>
Wed, 10 Jul 2013 15:11:29 +0000 (15:11 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Wed, 10 Jul 2013 15:11:29 +0000 (15:11 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 37228

include/host.mk
rules.mk

index b44c1bf..000fb18 100644 (file)
@@ -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" >> $@; \
index 6a283bd..2e9e20d 100644 (file)
--- 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