root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update erlang.mk

This commit is contained in:
Jean-Sébastien Pédron 2015-11-19 14:31:35 +01:00
parent ac5ebd7376
commit a7b8592b63
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/rabbit_common/erlang.mk vendored
View File

@ -16,7 +16,7 @@
ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST))) ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
ERLANG_MK_VERSION = 1.2.0-849-g93261ea-dirty ERLANG_MK_VERSION = 1.2.0-849-g29268fc-dirty
# Core configuration. # Core configuration.
@ -6501,7 +6501,7 @@ endif
$(verbose) for dep in $^ ; do \ $(verbose) for dep in $^ ; do \
if ! grep -qs ^$$dep$$ $(ERLANG_MK_TMP)/$@.log; then \ if ! grep -qs ^$$dep$$ $(ERLANG_MK_TMP)/$@.log; then \
echo $$dep >> $(ERLANG_MK_TMP)/$@.log; \ echo $$dep >> $(ERLANG_MK_TMP)/$@.log; \
if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(|.*/)erlang\.mk$$" \ if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(erlang\.mk|.*/erlang\.mk)$$" \
$$dep/GNUmakefile $$dep/makefile $$dep/Makefile; then \ $$dep/GNUmakefile $$dep/makefile $$dep/Makefile; then \
$(MAKE) -C $$dep $@ IS_DEP=1 || exit $$?; \ $(MAKE) -C $$dep $@ IS_DEP=1 || exit $$?; \
fi \ fi \
@ -6565,7 +6565,7 @@ ifndef IS_APP
done done
endif endif
$(verbose) for dep in $(filter-out $(CURDIR),$(LIST_DIRS)); do \ $(verbose) for dep in $(filter-out $(CURDIR),$(LIST_DIRS)); do \
if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(|.*/)erlang\.mk$$" \ if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(erlang\.mk|.*/erlang\.mk)$$" \
$$dep/GNUmakefile $$dep/makefile $$dep/Makefile; then \ $$dep/GNUmakefile $$dep/makefile $$dep/Makefile; then \
$(MAKE) -C "$$dep" --no-print-directory $@ IS_DEP=1; \ $(MAKE) -C "$$dep" --no-print-directory $@ IS_DEP=1; \
fi; \ fi; \