WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit b4b2b72

Browse files
lukebakkenmergify[bot]
authored andcommitted
Fix dialyze target in plugins when asdf is used
[This](ninenines/erlang.mk@e13b4c7) `erlang.mk` commit fixed the detection of Elixir libraries for `asdf` users, but the "old way" remained in `rabbitmq-early-plugin.mk`. Removing the `dialyze` target env definitions and setting `ELIXIR = system` in `rabbitmq-components.mk` fixes this issue, and, the value of `ERL_LIBS` that is set is the same. Win-win. (cherry picked from commit 03a07d9)
1 parent bff442f commit b4b2b72

File tree

5 files changed

+4
-13
lines changed

5 files changed

+4
-13
lines changed

deps/oauth2_client/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,5 @@ PLT_APPS = rabbit
1111
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
1212
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
1313

14-
# Required to properly autopatch jose.
15-
ELIXIR = system
16-
1714
include rabbitmq-components.mk
1815
include erlang.mk

deps/rabbit_common/mk/rabbitmq-early-plugin.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44

55
DIALYZER_OPTS ?= -Werror_handling -Wunmatched_returns -Wunknown
66

7-
dialyze: ELIXIR_LIBS = $(dir $(shell readlink -f `which elixir`))/../lib
8-
dialyze: ERL_LIBS = $(APPS_DIR):$(DEPS_DIR):$(ELIXIR_LIBS)
9-
107
# --------------------------------------------------------------------
118
# Common Test flags.
129
# --------------------------------------------------------------------

deps/rabbitmq_auth_backend_oauth2/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,5 @@ dep_base64url = hex 1.0.1
1919

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

22-
# Required to properly autopatch jose.
23-
ELIXIR = system
24-
2522
include ../../rabbitmq-components.mk
2623
include ../../erlang.mk

deps/rabbitmq_cli/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk
3030
VERBOSE_TEST ?= true
3131
MAX_CASES ?= 1
3232

33-
# Force enable Elixir in this project since
34-
# this is an Elixir application.
35-
ELIXIR = system
36-
3733
# We are still using Mix for testing.
3834
MIX_TEST_OPTS ?= ""
3935
MIX_TEST = ERL_COMPILER_OPTIONS=deterministic MIX_ENV=test mix do compile --warnings-as-errors, test --max-cases=$(MAX_CASES) --warnings-as-errors

rabbitmq-components.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Force enable Elixir in all projects since
2+
# running dialyzer on any of them requires it
3+
ELIXIR = system
4+
15
ifeq ($(.DEFAULT_GOAL),)
26
# Define default goal to `all` because this file defines some targets
37
# before the inclusion of erlang.mk leading to the wrong target becoming

0 commit comments

Comments
 (0)