crans/openwrt-chaoscalmer-uappro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: move the XARGS variable out of the host checks, since a working xargs is built in tools/

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37228 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2013-07-10 15:11:29 +00:00
parent 771d19f9b6
commit 553f808933
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/host.mk
View file

@ -54,11 +54,6 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
else \ else \
echo "FIND_L=$$FIND \$$(1) -follow" >> $@; \ echo "FIND_L=$$FIND \$$(1) -follow" >> $@; \
fi; \ 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`; \ PATCH=`which gpatch 2>/dev/null`; \
[ -n "$$PATCH" -a -x "$$PATCH" ] || PATCH=`which patch 2>/dev/null`; \ [ -n "$$PATCH" -a -x "$$PATCH" ] || PATCH=`which patch 2>/dev/null`; \
echo "PATCH:=$$PATCH" >> $@; \ echo "PATCH:=$$PATCH" >> $@; \

1
rules.mk
View file

@ -207,6 +207,7 @@ KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
SED:=$(STAGING_DIR_HOST)/bin/sed -i -e SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
CP:=cp -fpR CP:=cp -fpR
LN:=ln -sf LN:=ln -sf
XARGS:=xargs -r
INSTALL_BIN:=install -m0755 INSTALL_BIN:=install -m0755
INSTALL_DIR:=install -d -m0755 INSTALL_DIR:=install -d -m0755