Skip to content

Commit df118d2

Browse files
committed
Bump erlang.mk to fix x509 0.9.0 compilation
1 parent d76acae commit df118d2

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

erlang.mk

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
1818
export ERLANG_MK_FILENAME
1919

20-
ERLANG_MK_VERSION = e13b4c7
20+
ERLANG_MK_VERSION = f157f11
2121
ERLANG_MK_WITHOUT =
2222

2323
# Make 3.81 and 3.82 are deprecated.
@@ -559,6 +559,14 @@ export ERL_LIBS
559559

560560
export NO_AUTOPATCH
561561

562+
# Elixir.
563+
564+
# Elixir is automatically enabled in all cases except when
565+
# an Erlang project uses an Elixir dependency. In that case
566+
# $(ELIXIR) must be set explicitly.
567+
ELIXIR ?= $(if $(filter elixir,$(BUILD_DEPS) $(DEPS)),dep,$(if $(EX_FILES),system,disable))
568+
export ELIXIR
569+
562570
# Verbosity.
563571

564572
dep_verbose_0 = @echo " DEP $1 ($(call query_version,$1))";
@@ -1778,12 +1786,6 @@ endif
17781786
# Copyright (c) 2024, Loïc Hoguin <[email protected]>
17791787
# This file is part of erlang.mk and subject to the terms of the ISC License.
17801788

1781-
# Elixir is automatically enabled in all cases except when
1782-
# an Erlang project uses an Elixir dependency. In that case
1783-
# $(ELIXIR) must be set explicitly.
1784-
ELIXIR ?= $(if $(filter elixir,$(BUILD_DEPS) $(DEPS)),dep,$(if $(EX_FILES),system,disable))
1785-
export ELIXIR
1786-
17871789
ifeq ($(ELIXIR),system)
17881790
# We expect 'elixir' to be on the path.
17891791
ELIXIR_BIN ?= $(shell readlink -f `which elixir`)
@@ -1964,6 +1966,7 @@ endef
19641966
define compile_ex.erl
19651967
{ok, _} = application:ensure_all_started(elixir),
19661968
{ok, _} = application:ensure_all_started(mix),
1969+
$(foreach dep,$(LOCAL_DEPS),_ = application:load($(dep)),)
19671970
ModCode = list_to_atom("Elixir.Code"),
19681971
ModCode:put_compiler_option(ignore_module_conflict, true),
19691972
ModComp = list_to_atom("Elixir.Kernel.ParallelCompiler"),

0 commit comments

Comments
 (0)