build: get rid of FIND_L from host.mk
authorFelix Fietkau <nbd@nbd.name>
Mon, 20 Feb 2017 12:03:49 +0000 (13:03 +0100)
committerFelix Fietkau <nbd@nbd.name>
Sun, 26 Feb 2017 12:31:44 +0000 (13:31 +0100)
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>
include/host.mk
include/scan.mk

index ec3ae27..2ccab8e 100644 (file)
@@ -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
index 3a884fb..92f2dc3 100644 (file)
@@ -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)
        ( \