diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-10-07 09:53:11 +0200 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-10-07 10:28:57 +0200 |
| commit | f6e4576c3c741a08b5b57f51a6a4796b477e707a (patch) | |
| tree | dacd87d67fc51020436113706e3ab80f81890bb1 | |
| parent | 0ceb9bbf7e9440290ffc629f2a31396e5f02dd46 (diff) | |
| download | rabbitmq-server-git-f6e4576c3c741a08b5b57f51a6a4796b477e707a.tar.gz | |
Simplify erlc opts for rabbitmq_peer_discovery_common
(cherry picked from commit 49a47586b075c19e5af521a3f1d333ed8fab4654)
5 files changed, 4 insertions, 14 deletions
diff --git a/deps/rabbitmq_peer_discovery_common/BUILD.bazel b/deps/rabbitmq_peer_discovery_common/BUILD.bazel index a1889dcc31..c1f917f2aa 100644 --- a/deps/rabbitmq_peer_discovery_common/BUILD.bazel +++ b/deps/rabbitmq_peer_discovery_common/BUILD.bazel @@ -29,21 +29,11 @@ RUNTIME_DEPS = [ "//deps/rabbit:bazel_erlang_lib", ] -ERLC_OPTS = RABBITMQ_ERLC_OPTS + [ - "-I deps/rabbitmq_peer_discovery_common", -] - -TEST_ERLC_OPTS = RABBITMQ_TEST_ERLC_OPTS + [ - "-I deps/rabbitmq_peer_discovery_common", -] - rabbitmq_lib( app_description = APP_DESCRIPTION, app_module = APP_MODULE, app_name = APP_NAME, - erlc_opts = ERLC_OPTS, extra_apps = EXTRA_APPS, - test_erlc_opts = TEST_ERLC_OPTS, runtime_deps = RUNTIME_DEPS, deps = DEPS, ) diff --git a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_cleanup.erl b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_cleanup.erl index 16519e4f0e..635ee08457 100644 --- a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_cleanup.erl +++ b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_cleanup.erl @@ -11,7 +11,7 @@ -behaviour(gen_server). -include_lib("kernel/include/logger.hrl"). --include("include/rabbit_peer_discovery.hrl"). +-include("rabbit_peer_discovery.hrl"). -export([start_link/0, check_cluster/0]). diff --git a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_config.erl b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_config.erl index 5dfeef0321..14fcbdb843 100644 --- a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_config.erl +++ b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_config.erl @@ -10,7 +10,7 @@ -module(rabbit_peer_discovery_config). -include_lib("kernel/include/logger.hrl"). --include("include/rabbit_peer_discovery.hrl"). +-include("rabbit_peer_discovery.hrl"). -export([get/3, get_integer/3, config_map/1]). diff --git a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_httpc.erl b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_httpc.erl index fa48db1389..f0c734adc4 100644 --- a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_httpc.erl +++ b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_httpc.erl @@ -10,7 +10,7 @@ -module(rabbit_peer_discovery_httpc). -include_lib("kernel/include/logger.hrl"). --include("include/rabbit_peer_discovery.hrl"). +-include("rabbit_peer_discovery.hrl"). %% %% API diff --git a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_util.erl b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_util.erl index bea5e59f8c..f7b3a529e0 100644 --- a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_util.erl +++ b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_util.erl @@ -25,7 +25,7 @@ ]). -include_lib("kernel/include/logger.hrl"). --include("include/rabbit_peer_discovery.hrl"). +-include("rabbit_peer_discovery.hrl"). %% Export all for unit tests -ifdef(TEST). |