Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions deps/oauth2_client/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,5 @@ PLT_APPS = rabbit
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

# Required to properly autopatch jose.
ELIXIR = system

include rabbitmq-components.mk
include erlang.mk
3 changes: 0 additions & 3 deletions deps/rabbit_common/mk/rabbitmq-early-plugin.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

DIALYZER_OPTS ?= -Werror_handling -Wunmatched_returns -Wunknown

dialyze: ELIXIR_LIBS = $(dir $(shell readlink -f `which elixir`))/../lib
dialyze: ERL_LIBS = $(APPS_DIR):$(DEPS_DIR):$(ELIXIR_LIBS)

# --------------------------------------------------------------------
# Common Test flags.
# --------------------------------------------------------------------
Expand Down
3 changes: 0 additions & 3 deletions deps/rabbitmq_auth_backend_oauth2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,5 @@ dep_base64url = hex 1.0.1

dep_emqtt = git https://github.com/emqx/emqtt.git 1.14.6

# Required to properly autopatch jose.
ELIXIR = system

include ../../rabbitmq-components.mk
include ../../erlang.mk
4 changes: 0 additions & 4 deletions deps/rabbitmq_cli/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk
VERBOSE_TEST ?= true
MAX_CASES ?= 1

# Force enable Elixir in this project since
# this is an Elixir application.
ELIXIR = system

# We are still using Mix for testing.
MIX_TEST_OPTS ?= ""
MIX_TEST = ERL_COMPILER_OPTIONS=deterministic MIX_ENV=test mix do compile --warnings-as-errors, test --max-cases=$(MAX_CASES) --warnings-as-errors
Expand Down
4 changes: 4 additions & 0 deletions rabbitmq-components.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Force enable Elixir in all projects since
# running dialyzer on any of them requires it
ELIXIR = system

ifeq ($(.DEFAULT_GOAL),)
# Define default goal to `all` because this file defines some targets
# before the inclusion of erlang.mk leading to the wrong target becoming
Expand Down