root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Bump erlang.mk to fix x509 0.9.0 compilation

This commit is contained in:
Michal Kuratczyk 2025-06-25 13:06:49 +02:00
parent 87dac547ff
commit 5ea53632f5
No known key found for this signature in database
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erlang.mk vendored
View File

@ -17,7 +17,7 @@
ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST))) ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
export ERLANG_MK_FILENAME export ERLANG_MK_FILENAME
ERLANG_MK_VERSION = e13b4c7 ERLANG_MK_VERSION = f157f11
ERLANG_MK_WITHOUT = ERLANG_MK_WITHOUT =
# Make 3.81 and 3.82 are deprecated. # Make 3.81 and 3.82 are deprecated.
@ -559,6 +559,14 @@ export ERL_LIBS
export NO_AUTOPATCH export NO_AUTOPATCH
# Elixir.
# Elixir is automatically enabled in all cases except when
# an Erlang project uses an Elixir dependency. In that case
# $(ELIXIR) must be set explicitly.
ELIXIR ?= $(if $(filter elixir,$(BUILD_DEPS) $(DEPS)),dep,$(if $(EX_FILES),system,disable))
export ELIXIR
# Verbosity. # Verbosity.
dep_verbose_0 = @echo " DEP $1 ($(call query_version,$1))"; dep_verbose_0 = @echo " DEP $1 ($(call query_version,$1))";
@ -1778,12 +1786,6 @@ endif
# Copyright (c) 2024, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2024, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
# Elixir is automatically enabled in all cases except when
# an Erlang project uses an Elixir dependency. In that case
# $(ELIXIR) must be set explicitly.
ELIXIR ?= $(if $(filter elixir,$(BUILD_DEPS) $(DEPS)),dep,$(if $(EX_FILES),system,disable))
export ELIXIR
ifeq ($(ELIXIR),system) ifeq ($(ELIXIR),system)
# We expect 'elixir' to be on the path. # We expect 'elixir' to be on the path.
ELIXIR_BIN ?= $(shell readlink -f `which elixir`) ELIXIR_BIN ?= $(shell readlink -f `which elixir`)
@ -1964,6 +1966,7 @@ endef
define compile_ex.erl define compile_ex.erl
{ok, _} = application:ensure_all_started(elixir), {ok, _} = application:ensure_all_started(elixir),
{ok, _} = application:ensure_all_started(mix), {ok, _} = application:ensure_all_started(mix),
$(foreach dep,$(LOCAL_DEPS),_ = application:load($(dep)),)
ModCode = list_to_atom("Elixir.Code"), ModCode = list_to_atom("Elixir.Code"),
ModCode:put_compiler_option(ignore_module_conflict, true), ModCode:put_compiler_option(ignore_module_conflict, true),
ModComp = list_to_atom("Elixir.Kernel.ParallelCompiler"), ModComp = list_to_atom("Elixir.Kernel.ParallelCompiler"),