diff options
| author | Loïc Hoguin <[email protected]> | 2025-06-19 16:19:34 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2025-06-19 16:19:34 +0200 |
| commit | ce2a1ba5ed37586dacbf1def01f23a9f550767e1 (patch) | |
| tree | 3fed4908c67d588e2202d0e11d9c3e2ea9398d39 /core | |
| parent | e13b4c71d764cc92a1e5a92f5f2dd1c1f59b4a3c (diff) | |
| download | erlang.mk-ce2a1ba5ed37586dacbf1def01f23a9f550767e1.tar.gz erlang.mk-ce2a1ba5ed37586dacbf1def01f23a9f550767e1.tar.bz2 erlang.mk-ce2a1ba5ed37586dacbf1def01f23a9f550767e1.zip | |
Fix Mix autopatch being enabled by default
By default Erlang projects should not have Elixir enabled.
Diffstat (limited to 'core')
| -rw-r--r-- | core/deps.mk | 8 | ||||
| -rw-r--r-- | core/elixir.mk | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/core/deps.mk b/core/deps.mk index 8b158b7..da7f7c4 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -142,6 +142,14 @@ export ERL_LIBS 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. dep_verbose_0 = @echo " DEP $1 ($(call query_version,$1))"; diff --git a/core/elixir.mk b/core/elixir.mk index eb5c487..cd62e78 100644 --- a/core/elixir.mk +++ b/core/elixir.mk @@ -2,12 +2,6 @@ # Copyright (c) 2024, Loïc Hoguin <[email protected]> # 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) # We expect 'elixir' to be on the path. ELIXIR_BIN ?= $(shell readlink -f `which elixir`) |