Fix dialyze target in plugins when asdf is used

lukebakken · lukebakken · commit 37bf911135b2 · 2025-12-05T14:28:04.000-08:00
[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 fixes this issue, and, the value of `ERL_LIBS` that is set is the same. Win-win.
diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile
@@ -151,6 +151,7 @@ MD_MANPAGES  = $(patsubst %,%.md,$(MANPAGES))
 CT_HOOKS = rabbit_ct_hook
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbit_common/mk/rabbitmq-early-plugin.mk b/deps/rabbit_common/mk/rabbitmq-early-plugin.mk
@@ -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.
 # --------------------------------------------------------------------
diff --git a/deps/rabbitmq_auth_backend_cache/Makefile b/deps/rabbitmq_auth_backend_cache/Makefile
@@ -23,6 +23,7 @@ PLT_APPS += rabbitmq_cli
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_auth_backend_http/Makefile b/deps/rabbitmq_auth_backend_http/Makefile
@@ -25,6 +25,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers cowboy rabbitmq_amqp_
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_auth_backend_ldap/Makefile b/deps/rabbitmq_auth_backend_ldap/Makefile
@@ -41,6 +41,7 @@ dep_ct_helper = git https://github.com/extend/ct_helper.git master
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_auth_mechanism_ssl/Makefile b/deps/rabbitmq_auth_mechanism_ssl/Makefile
@@ -18,6 +18,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp10_client
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_aws/Makefile b/deps/rabbitmq_aws/Makefile
@@ -15,6 +15,7 @@ PLT_APPS = rabbit
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_consistent_hash_exchange/Makefile b/deps/rabbitmq_consistent_hash_exchange/Makefile
@@ -12,6 +12,7 @@ PLT_APPS += mnesia rabbitmq_cli
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_ct_helpers/Makefile b/deps/rabbitmq_ct_helpers/Makefile
@@ -18,6 +18,7 @@ dep_inet_tcp_proxy = git https://github.com/rabbitmq/inet_tcp_proxy master
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_event_exchange/Makefile b/deps/rabbitmq_event_exchange/Makefile
@@ -16,6 +16,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_exchange_federation/Makefile b/deps/rabbitmq_exchange_federation/Makefile
@@ -20,6 +20,7 @@ PLT_APPS += rabbitmq_cli
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_federation_common/Makefile b/deps/rabbitmq_federation_common/Makefile
@@ -20,6 +20,7 @@ PLT_APPS += rabbitmq_cli
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_federation_management/Makefile b/deps/rabbitmq_federation_management/Makefile
@@ -10,6 +10,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_federation_prometheus/Makefile b/deps/rabbitmq_federation_prometheus/Makefile
@@ -11,6 +11,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_jms_topic_exchange/Makefile b/deps/rabbitmq_jms_topic_exchange/Makefile
@@ -7,6 +7,7 @@ LOCAL_DEPS = mnesia
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_management/Makefile b/deps/rabbitmq_management/Makefile
@@ -34,6 +34,7 @@ BUILD_DEPS += ranch
 CT_HOOKS = rabbit_ct_hook
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_management_agent/Makefile b/deps/rabbitmq_management_agent/Makefile
@@ -25,6 +25,7 @@ PLT_APPS += rabbitmq_cli
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 TEST_DEPS := $(filter-out rabbitmq_test,$(TEST_DEPS))
diff --git a/deps/rabbitmq_peer_discovery_aws/Makefile b/deps/rabbitmq_peer_discovery_aws/Makefile
@@ -8,6 +8,7 @@ dep_ct_helper = git https://github.com/extend/ct_helper.git master
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_peer_discovery_common/Makefile b/deps/rabbitmq_peer_discovery_common/Makefile
@@ -9,6 +9,7 @@ dep_ct_helper = git https://github.com/extend/ct_helper.git master
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_peer_discovery_consul/Makefile b/deps/rabbitmq_peer_discovery_consul/Makefile
@@ -7,6 +7,7 @@ dep_ct_helper = git https://github.com/extend/ct_helper.git master
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_peer_discovery_k8s/Makefile b/deps/rabbitmq_peer_discovery_k8s/Makefile
@@ -7,6 +7,7 @@ dep_ct_helper = git https://github.com/extend/ct_helper.git master
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_prometheus/Makefile b/deps/rabbitmq_prometheus/Makefile
@@ -15,6 +15,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_stream
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 ifneq ($(DISABLE_METRICS_COLLECTOR),)
 RABBITMQ_CONFIG_FILE = $(CURDIR)/rabbitmq-disable-metrics-collector.conf
diff --git a/deps/rabbitmq_queue_federation/Makefile b/deps/rabbitmq_queue_federation/Makefile
@@ -19,6 +19,7 @@ PLT_APPS += rabbitmq_cli
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_random_exchange/Makefile b/deps/rabbitmq_random_exchange/Makefile
@@ -6,6 +6,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_recent_history_exchange/Makefile b/deps/rabbitmq_recent_history_exchange/Makefile
@@ -12,6 +12,7 @@ PLT_APPS += mnesia
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_sharding/Makefile b/deps/rabbitmq_sharding/Makefile
@@ -10,6 +10,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_shovel/Makefile b/deps/rabbitmq_shovel/Makefile
@@ -29,6 +29,7 @@ PLT_APPS += rabbitmq_cli
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk elvis_mk
+ELIXIR = system
 dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master
 
 include ../../rabbitmq-components.mk
diff --git a/deps/rabbitmq_shovel_management/Makefile b/deps/rabbitmq_shovel_management/Makefile
@@ -10,6 +10,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers meck
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_shovel_prometheus/Makefile b/deps/rabbitmq_shovel_prometheus/Makefile
@@ -11,6 +11,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_stream_management/Makefile b/deps/rabbitmq_stream_management/Makefile
@@ -12,6 +12,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_top/Makefile b/deps/rabbitmq_top/Makefile
@@ -10,6 +10,7 @@ DEPS = rabbit_common rabbit amqp_client rabbitmq_management
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_tracing/Makefile b/deps/rabbitmq_tracing/Makefile
@@ -19,6 +19,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_trust_store/Makefile b/deps/rabbitmq_trust_store/Makefile
@@ -17,6 +17,7 @@ dep_ct_helper = git https://github.com/extend/ct_helper.git master
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_web_dispatch/Makefile b/deps/rabbitmq_web_dispatch/Makefile
@@ -12,6 +12,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 TEST_DEPS := $(filter-out rabbitmq_test,$(TEST_DEPS))
diff --git a/deps/rabbitmq_web_mqtt_examples/Makefile b/deps/rabbitmq_web_mqtt_examples/Makefile
@@ -12,6 +12,7 @@ DEPS = rabbit_common rabbit rabbitmq_web_dispatch rabbitmq_web_mqtt
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_web_stomp/Makefile b/deps/rabbitmq_web_stomp/Makefile
@@ -32,6 +32,7 @@ dep_gun = hex 2.2.0
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
diff --git a/deps/rabbitmq_web_stomp_examples/Makefile b/deps/rabbitmq_web_stomp_examples/Makefile
@@ -12,6 +12,7 @@ DEPS = rabbit_common rabbit rabbitmq_web_dispatch rabbitmq_web_stomp
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
+ELIXIR = system
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
