aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2016-10-04 21:15:33 +0200
committerLoïc Hoguin <[email protected]>2016-10-04 21:15:33 +0200
commitd387560fa0e3c4188b86f12e69774c3bf0c064bc (patch)
tree23f17a050a88b82b91dd647b96b3935e6afa5300
parent7feb41d8b9f92a89ce98dc92e6309946bd8a7d8f (diff)
downloaderlang.mk-d387560fa0e3c4188b86f12e69774c3bf0c064bc.tar.gz
erlang.mk-d387560fa0e3c4188b86f12e69774c3bf0c064bc.tar.bz2
erlang.mk-d387560fa0e3c4188b86f12e69774c3bf0c064bc.zip
Update rebar (should be correct this time)
-rw-r--r--core/deps.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/deps.mk b/core/deps.mk
index ac8eaaa..a1c1cd8 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -163,7 +163,7 @@ define dep_autopatch_fetch_rebar
if [ ! -d $(ERLANG_MK_TMP)/rebar ]; then \
git clone -q -n -- https://github.com/rebar/rebar $(ERLANG_MK_TMP)/rebar; \
cd $(ERLANG_MK_TMP)/rebar; \
- git checkout -q 791db716b5a3a7671e0b351f95ddf24b848ee173; \
+ git checkout -q 576e12171ab8d69b048b827b92aa65d067deea01; \
$(MAKE); \
cd -; \
fi
@@ -180,6 +180,7 @@ endef
define dep_autopatch_rebar.erl
application:load(rebar),
application:set_env(rebar, log_level, debug),
+ rmemo:start(),
Conf1 = case file:consult("$(call core_native_path,$(DEPS_DIR)/$1/rebar.config)") of
{ok, Conf0} -> Conf0;
_ -> []