KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

include: remove host command tests from host.mk

Browse source 
Those tests are part of prereq-build.mk now.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44273
This commit is contained in:
Jo-Philipp Wich 2015-02-05 16:57:31 +00:00
parent 78f476ed02
commit 16e1d82460
1 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
include/host.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007-2010 OpenWrt.org # Copyright (C) 2007-2015 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -10,8 +10,6 @@ ifeq ($(if $(TARGET_BUILD),,$(DUMP)),)
-include $(TMP_DIR)/.host.mk -include $(TMP_DIR)/.host.mk
endif endif
export TAR FIND
ifneq ($(__host_inc),1) ifneq ($(__host_inc),1)
__host_inc:=1 __host_inc:=1
@ -41,25 +39,11 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
echo "HOST_OS:=$$HOST_OS" > $@; \ echo "HOST_OS:=$$HOST_OS" > $@; \
echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \ echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \
echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \ echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \
TAR=`which gtar 2>/dev/null`; \ if gfind -L /dev/null || find -L /dev/null; then \
[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which gnutar 2>/dev/null`; \ echo "FIND_L=find -L \$$(1)" >> $@; \
[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \
echo "TAR:=$$TAR" >> $@; \
FIND=`which gfind 2>/dev/null`; \
[ -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)" >>$@; \
else \ else \
echo "FIND_L=$$FIND \$$(1) -follow" >> $@; \ echo "FIND_L=find \$$(1) -follow" >> $@; \
fi; \ fi \
PATCH=`which gpatch 2>/dev/null`; \ ) >/dev/null 2>/dev/null
[ -n "$$PATCH" -a -x "$$PATCH" ] || PATCH=`which patch 2>/dev/null`; \
echo "PATCH:=$$PATCH" >> $@; \
PYTHON=`which python2.7 2>/dev/null`; \
[ -n "$$PYTHON" -a -x "$$PYTHON" ] || PYTHON=`which python 2>/dev/null`; \
echo "PYTHON:=$$PYTHON" >> $@; \
)
endif endif