From 4daeb41f0efece3b5d3349d21b647cbea3b39e5f Mon Sep 17 00:00:00 2001 From: Badlop Date: Mon, 25 Dec 2023 22:18:53 +0100 Subject: [PATCH] Elixir: Fix compiling ejabberd as a dependency (4128) --- mix.exs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mix.exs b/mix.exs index faf559446..bef8d02ba 100644 --- a/mix.exs +++ b/mix.exs @@ -68,7 +68,7 @@ defmodule Ejabberd.MixProject do defp erlc_options do # Use our own includes + includes from all dependencies - includes = ["include"] ++ deps_include(["fast_xml", "xmpp", "p1_utils"]) + includes = ["include", deps_include()] result = [{:d, :ELIXIR_ENABLED}] ++ cond_options() ++ Enum.map(includes, fn (path) -> {:i, path} end) ++ @@ -119,8 +119,8 @@ defmodule Ejabberd.MixProject do ++ cond_deps() end - defp deps_include(deps) do - base = if Mix.Project.umbrella?() do + defp deps_include() do + if Mix.Project.umbrella?() do "../../deps" else case Mix.Project.deps_paths()[:ejabberd] do @@ -128,7 +128,6 @@ defmodule Ejabberd.MixProject do _ -> ".." end end - Enum.map(deps, fn dep -> base<>"/#{dep}/include" end) end defp cond_deps do