diff options
author | Loïc Hoguin <[email protected]> | 2025-03-19 12:27:02 +0100 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2025-03-19 17:07:01 +0100 |
commit | f7bc2bd13f32af13af1a8e37745b935068c45671 (patch) | |
tree | c419277fe14545eeb2bde85621d6e1889844d4ee /core/elixir.mk | |
parent | a5e7fd2ed1f7d756edee8e19af8bb639e1287ee6 (diff) | |
download | erlang.mk-elixir-related-fixes.tar.gz erlang.mk-elixir-related-fixes.tar.bz2 erlang.mk-elixir-related-fixes.zip |
Properly handle asdf-installed Elixirelixir-related-fixes
Diffstat (limited to 'core/elixir.mk')
-rw-r--r-- | core/elixir.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/elixir.mk b/core/elixir.mk index 8d1dba9..eb5c487 100644 --- a/core/elixir.mk +++ b/core/elixir.mk @@ -10,7 +10,12 @@ export ELIXIR ifeq ($(ELIXIR),system) # We expect 'elixir' to be on the path. -ELIXIR_LIBS ?= $(dir $(shell readlink -f `which elixir`))/../lib +ELIXIR_BIN ?= $(shell readlink -f `which elixir`) +ELIXIR_LIBS ?= $(abspath $(dir $(ELIXIR_BIN))/../lib) +# Fallback in case 'elixir' is a shim. +ifeq ($(wildcard $(ELIXIR_LIBS)/elixir/),) +ELIXIR_LIBS = $(abspath $(shell elixir -e 'IO.puts(:code.lib_dir(:elixir))')/../) +endif ELIXIR_LIBS := $(ELIXIR_LIBS) export ELIXIR_LIBS ERL_LIBS := $(ERL_LIBS):$(ELIXIR_LIBS) |