diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-02-20 13:03:49 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-12-13 14:32:21 +0100 |
| commit | acd481470c49104bdf774f8b495d80d5e2061123 (patch) | |
| tree | b7dedb71990dc0c207862fbe34431f4f311750d6 | |
| parent | 11cd6077ba90938ca58213a63f4a73b9443292f7 (diff) | |
| download | upstream-acd481470c49104bdf774f8b495d80d5e2061123.tar.gz upstream-acd481470c49104bdf774f8b495d80d5e2061123.tar.bz2 upstream-acd481470c49104bdf774f8b495d80d5e2061123.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>
(cherry picked from commit be206eba3a57128695a00f490767e5c136e43ab7)
| -rw-r--r-- | include/host.mk | 5 | ||||
| -rw-r--r-- | include/scan.mk | 2 |
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) ( \ |