From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 20 Feb 2017 12:03:49 +0000 (+0100)
Subject: build: get rid of FIND_L from host.mk
X-Git-Tag: v17.01.5~286
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=acd481470c49104bdf774f8b495d80d5e2061123;p=oweals%2Fopenwrt.git

build: get rid of FIND_L from host.mk

This was added for Mac OS X many years ago, but recent versions also
support find -L

Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit be206eba3a57128695a00f490767e5c136e43ab7)
---

diff --git a/include/host.mk b/include/host.mk
index ec3ae276a4..2ccab8e1e6 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -41,11 +41,6 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
 		echo "HOST_OS:=$$HOST_OS" > $@; \
 		echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \
 		echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \
-		if gfind -L /dev/null || find -L /dev/null; then \
-			echo "FIND_L=find -L \$$(1)" >> $@; \
-		else \
-			echo "FIND_L=find \$$(1) -follow" >> $@; \
-		fi \
 	) >/dev/null 2>/dev/null
 
 endif
diff --git a/include/scan.mk b/include/scan.mk
index 3a884fb5f5..92f2dc3f93 100644
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -56,7 +56,7 @@ endif
 
 $(FILELIST): $(OVERRIDELIST)
 	rm -f $(TMP_DIR)/info/.files-$(SCAN_TARGET)-*
-	$(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -aHE 'call $(GREP_STRING)' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq | awk -v of=$(OVERRIDELIST) -f include/scan.awk > $@
+	find -L $(SCAN_DIR) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -aHE 'call $(GREP_STRING)' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq | awk -v of=$(OVERRIDELIST) -f include/scan.awk > $@
 
 $(TMP_DIR)/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
 	( \