From f5ccb55568d088351322c5827b66767167802689 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 13 Oct 2006 22:47:39 +0000 Subject: fix tar detection git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5061 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/host.mk b/include/host.mk index 3a5fd9683e..11522184b7 100644 --- a/include/host.mk +++ b/include/host.mk @@ -22,10 +22,11 @@ $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk echo "HOST_OS:=$$HOST_OS" > $@; \ echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \ echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \ - if tar --version 2>&1 | grep 'GNU' >/dev/null; then \ + TAR=`which gtar`; \ + [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar`; \ + echo "TAR:=$$TAR" >> $@; \ + if $$TAR --version 2>&1 | grep 'GNU' >/dev/null; then \ echo "TAR_WILDCARDS:=--wildcards" >> $@; \ fi; \ - TAR=`which gtar tar | head -n 1`; \ - echo "TAR:=$$TAR" >> $@; \ ) -- cgit v1.2.3