aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-02-20 13:03:49 +0100
committerFelix Fietkau <nbd@nbd.name>2017-02-26 13:31:44 +0100
commitbe206eba3a57128695a00f490767e5c136e43ab7 (patch)
tree277e7d882d7563e0001f7857a95fe74c40ecfc1e
parentffa9f3d74b777be78581f04811ff8df1699c6337 (diff)
downloadupstream-be206eba3a57128695a00f490767e5c136e43ab7.tar.gz
upstream-be206eba3a57128695a00f490767e5c136e43ab7.tar.bz2
upstream-be206eba3a57128695a00f490767e5c136e43ab7.zip
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>
-rw-r--r--include/host.mk5
-rw-r--r--include/scan.mk2
2 files changed, 1 insertions, 6 deletions
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)
( \