diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-09-17 09:34:50 +0200 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-09-17 09:34:50 +0200 |
| commit | bcd565f2cbb8e56afb9edbd7e9442be5a132513d (patch) | |
| tree | 0a4590e2ceb1efb9d20678fffed48312cd098952 | |
| parent | f81afb00cef9237a40f0eead835a8d122575ad8b (diff) | |
| download | rabbitmq-server-git-bcd565f2cbb8e56afb9edbd7e9442be5a132513d.tar.gz | |
Use the +deterministic compiler flag when building with Make
| -rw-r--r-- | deps/rabbit_common/mk/rabbitmq-build.mk | 2 | ||||
| -rw-r--r-- | deps/rabbitmq_cli/Makefile | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/deps/rabbit_common/mk/rabbitmq-build.mk b/deps/rabbit_common/mk/rabbitmq-build.mk index 988792d26c..9e17a5badc 100644 --- a/deps/rabbit_common/mk/rabbitmq-build.mk +++ b/deps/rabbit_common/mk/rabbitmq-build.mk @@ -18,6 +18,8 @@ ifneq ($(filter-out rabbit_common amqp_client,$(PROJECT)),) RMQ_ERLC_OPTS += -pa $(DEPS_DIR)/rabbitmq_cli/_build/dev/lib/rabbitmqctl/ebin endif +RMQ_ERLC_OPTS += +deterministic + # Push our compilation options to both the normal and test ERLC_OPTS. ERLC_OPTS += $(RMQ_ERLC_OPTS) TEST_ERLC_OPTS += $(RMQ_ERLC_OPTS) diff --git a/deps/rabbitmq_cli/Makefile b/deps/rabbitmq_cli/Makefile index 7ee7cc6ea6..f2d97bd3ae 100644 --- a/deps/rabbitmq_cli/Makefile +++ b/deps/rabbitmq_cli/Makefile @@ -13,7 +13,7 @@ VERBOSE_TEST ?= true MAX_CASES ?= 1 MIX_TEST_OPTS ?= "" -MIX_TEST = mix test --max-cases=$(MAX_CASES) +MIX_TEST = ERL_COMPILER_OPTIONS=deterministic mix test --max-cases=$(MAX_CASES) ifneq ("",$(MIX_TEST_OPTS)) MIX_TEST := $(MIX_TEST) $(MIX_TEST_OPTS) @@ -106,9 +106,9 @@ rabbitmqctl_srcs := mix.exs \ # ones). $(ACTUAL_ESCRIPTS): $(rabbitmqctl_srcs) $(gen_verbose) if test -d ../.hex; then \ - echo y | mix make_all_in_src_archive; \ + echo y | ERL_COMPILER_OPTIONS=deterministic mix make_all_in_src_archive; \ else \ - echo y | mix make_all; \ + echo y | ERL_COMPILER_OPTIONS=deterministic mix make_all; \ fi $(LINKED_ESCRIPTS): |