aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2018-09-12 14:59:35 +0200
committerLoïc Hoguin <[email protected]>2018-09-12 15:00:48 +0200
commit3b173fd42c1c80ce0b4768ff7d58381f58518fc1 (patch)
tree0df7227dea347cc18d2ab8cd5a57831947ed7e25
parent7a36bc7488c615cf8992ddb7e63e009101d72154 (diff)
downloadcowboy-3b173fd42c1c80ce0b4768ff7d58381f58518fc1.tar.gz
cowboy-3b173fd42c1c80ce0b4768ff7d58381f58518fc1.tar.bz2
cowboy-3b173fd42c1c80ce0b4768ff7d58381f58518fc1.zip
Update erlang.mk
-rw-r--r--erlang.mk18
1 files changed, 11 insertions, 7 deletions
diff --git a/erlang.mk b/erlang.mk
index fb33c5d..8c4f2fe 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -17,7 +17,7 @@
ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
export ERLANG_MK_FILENAME
-ERLANG_MK_VERSION = 6c8664c
+ERLANG_MK_VERSION = 2018.06.21-9-gdbc51f9
ERLANG_MK_WITHOUT =
# Make 3.81 and 3.82 are deprecated.
@@ -216,6 +216,8 @@ ifeq ($(strip $(KERL)),)
KERL := $(ERLANG_MK_TMP)/kerl/kerl
endif
+KERL_DIR = $(ERLANG_MK_TMP)/kerl
+
export KERL
KERL_GIT ?= https://github.com/kerl/kerl
@@ -242,7 +244,9 @@ $(KERL_INSTALL_DIR)/$1-native: $(KERL)
endif
endef
-$(KERL):
+$(KERL): $(KERL_DIR)
+
+$(KERL_DIR):
$(verbose) mkdir -p $(ERLANG_MK_TMP)
$(gen_verbose) git clone --depth 1 $(KERL_GIT) $(ERLANG_MK_TMP)/kerl
$(verbose) cd $(ERLANG_MK_TMP)/kerl && git checkout $(KERL_COMMIT)
@@ -251,7 +255,7 @@ $(KERL):
distclean:: distclean-kerl
distclean-kerl:
- $(gen_verbose) rm -rf $(KERL)
+ $(gen_verbose) rm -rf $(KERL_DIR)
# Allow users to select which version of Erlang/OTP to use for a project.
@@ -283,9 +287,9 @@ SHELL := env PATH=$(PATH) $(SHELL)
$(eval $(call kerl_hipe_target,$(ERLANG_HIPE)))
# Build Erlang/OTP only if it doesn't already exist.
-ifeq ($(wildcard $(KERL_INSTALL_DIR)/$(ERLANG_HIPE))$(BUILD_ERLANG_OTP),)
+ifeq ($(wildcard $(KERL_INSTALL_DIR)/$(ERLANG_HIPE)-native)$(BUILD_ERLANG_OTP),)
$(info Building HiPE-enabled Erlang/OTP $(ERLANG_OTP)... Please wait...)
-$(shell $(MAKE) $(KERL_INSTALL_DIR)/$(ERLANG_HIPE) ERLANG_HIPE=$(ERLANG_HIPE) BUILD_ERLANG_OTP=1 >&2)
+$(shell $(MAKE) $(KERL_INSTALL_DIR)/$(ERLANG_HIPE)-native ERLANG_HIPE=$(ERLANG_HIPE) BUILD_ERLANG_OTP=1 >&2)
endif
endif
@@ -5454,8 +5458,8 @@ endef
asciidoc-manual:: doc-deps
asciidoc-manual:: $(ASCIIDOC_MANUAL_FILES)
- $(call erlang,$(call asciidoc2man.erl,$?))
- $(foreach s,$(MAN_SECTIONS),mkdir -p doc/man$s/ && mv doc/src/manual/*.$s.gz doc/man$s/;)
+ $(gen_verbose) $(call erlang,$(call asciidoc2man.erl,$?))
+ $(verbose) $(foreach s,$(MAN_SECTIONS),mkdir -p doc/man$s/ && mv doc/src/manual/*.$s.gz doc/man$s/;)
install-docs:: install-asciidoc