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

rabbitmq-dist.mk: Fix an infinite loop

This commit is contained in:
Jean-Sébastien Pédron 2015-11-19 13:25:08 +01:00
parent 92c86da13d
commit ac5ebd7376
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deps/rabbit_common/mk/rabbitmq-dist.mk vendored
View File

@ -90,6 +90,10 @@ $$(if $$(shell test -f $$(dist_$(1)_appfile) && echo OK), \
endef endef
ifneq ($(filter do-dist,$(MAKECMDGOALS)),)
# The following code is evaluated only when running "make do-dist",
# otherwise it would trigger an infinite loop, as this code calls "make
# list-dist-deps" (see do_ez_target).
ifdef DIST_PLUGINS_LIST ifdef DIST_PLUGINS_LIST
# Now, try to create an .ez target for the top-level project and all # Now, try to create an .ez target for the top-level project and all
# dependencies. # dependencies.
@ -102,6 +106,7 @@ $(eval $(foreach app, \
$(filter-out rabbit,$(sort $(notdir $(shell cat $(DIST_PLUGINS_LIST)))) $(PROJECT)), \ $(filter-out rabbit,$(sort $(notdir $(shell cat $(DIST_PLUGINS_LIST)))) $(PROJECT)), \
$(call ez_target,$(app)))) $(call ez_target,$(app))))
endif endif
endif
# The actual recipe to create the .ez plugin archive. Some variables are # The actual recipe to create the .ez plugin archive. Some variables are
# defined in the do_ez_target macro above. All .ez archives are also # defined in the do_ez_target macro above. All .ez archives are also