mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 21:58:04 +00:00
build: move the XARGS variable out of the host checks, since a working xargs is built in tools/
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37228
This commit is contained in:
parent
4e042e4a84
commit
1c742fb388
@ -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
1
rules.mk
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user