[source] build: get rid of FIND_L from host.mk
LEDE Commits
lede-commits at lists.infradead.org
Thu Dec 14 09:43:14 PST 2017
jow pushed a commit to source.git, branch lede-17.01:
https://git.lede-project.org/acd481470c49104bdf774f8b495d80d5e2061123
commit acd481470c49104bdf774f8b495d80d5e2061123
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Feb 20 13:03:49 2017 +0100
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 at nbd.name>
(cherry picked from commit be206eba3a57128695a00f490767e5c136e43ab7)
---
include/host.mk | 5 -----
include/scan.mk | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/include/host.mk b/include/host.mk
index ec3ae27..2ccab8e 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 3a884fb..92f2dc3 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)
( \
More information about the lede-commits
mailing list