aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2016-03-02 16:18:12 +0100
committerLoïc Hoguin <[email protected]>2016-03-02 16:18:12 +0100
commitec4d6d60c84424384b856348031c4d6bd0a210f3 (patch)
treebfff00539f4843a7a9f563dffe438dbbeb79c227 /core
parent7fc809a30a2566463599b1743f242bf7a84dc864 (diff)
downloaderlang.mk-ec4d6d60c84424384b856348031c4d6bd0a210f3.tar.gz
erlang.mk-ec4d6d60c84424384b856348031c4d6bd0a210f3.tar.bz2
erlang.mk-ec4d6d60c84424384b856348031c4d6bd0a210f3.zip
Properly write hex dependencies in rebar.config for Rebar3
Diffstat (limited to 'core')
-rw-r--r--core/compat.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/compat.mk b/core/compat.mk
index c7faf9b..239bc1c 100644
--- a/core/compat.mk
+++ b/core/compat.mk
@@ -19,8 +19,12 @@ define compat_erlc_opts_to_list
endef
define compat_rebar_config
-{deps, [$(call comma_list,$(foreach d,$(DEPS),\
- {$(call dep_name,$d),".*",{git,"$(call dep_repo,$d)","$(call dep_commit,$d)"}}))]}.
+{deps, [
+$(call comma_list,$(foreach d,$(DEPS),\
+ $(if $(filter hex,$(call dep_fetch,$d)),\
+ {$(call dep_name,$d)$(comma)"$(call dep_repo,$d)"},\
+ {$(call dep_name,$d)$(comma)".*"$(comma){git,"$(call dep_repo,$d)"$(comma)"$(call dep_commit,$d)"}})))
+]}.
{erl_opts, $(call compat_erlc_opts_to_list,$(ERLC_OPTS))}.
endef