umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 12:20:24 +00:00
Code Issues Wiki Activity

Update erlang.mk

Browse source
This commit is contained in:
Loïc Hoguin 2018-09-12 14:59:35 +02:00
parent 7a36bc7488
commit 3b173fd42c
No known key found for this signature in database
GPG key ID: 8A9DF795F6FED764
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
erlang.mk vendored
View file

@ -17,7 +17,7 @@
ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST))) ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
export ERLANG_MK_FILENAME export ERLANG_MK_FILENAME
ERLANG_MK_VERSION = 6c8664c ERLANG_MK_VERSION = 2018.06.21-9-gdbc51f9
ERLANG_MK_WITHOUT = ERLANG_MK_WITHOUT =
# Make 3.81 and 3.82 are deprecated. # Make 3.81 and 3.82 are deprecated.
@ -216,6 +216,8 @@ ifeq ($(strip $(KERL)),)
KERL := $(ERLANG_MK_TMP)/kerl/kerl KERL := $(ERLANG_MK_TMP)/kerl/kerl
endif endif
KERL_DIR = $(ERLANG_MK_TMP)/kerl
export KERL export KERL
KERL_GIT ?= https://github.com/kerl/kerl KERL_GIT ?= https://github.com/kerl/kerl
@ -242,7 +244,9 @@ $(KERL_INSTALL_DIR)/$1-native: $(KERL)
endif endif
endef endef
$(KERL): $(KERL): $(KERL_DIR)
$(KERL_DIR):
$(verbose) mkdir -p $(ERLANG_MK_TMP) $(verbose) mkdir -p $(ERLANG_MK_TMP)
$(gen_verbose) git clone --depth 1 $(KERL_GIT) $(ERLANG_MK_TMP)/kerl $(gen_verbose) git clone --depth 1 $(KERL_GIT) $(ERLANG_MK_TMP)/kerl
$(verbose) cd $(ERLANG_MK_TMP)/kerl && git checkout $(KERL_COMMIT) $(verbose) cd $(ERLANG_MK_TMP)/kerl && git checkout $(KERL_COMMIT)
@ -251,7 +255,7 @@ $(KERL):
distclean:: distclean-kerl distclean:: distclean-kerl
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. # 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))) $(eval $(call kerl_hipe_target,$(ERLANG_HIPE)))
# Build Erlang/OTP only if it doesn't already exist. # 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...) $(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
endif endif
@ -5454,8 +5458,8 @@ endef
asciidoc-manual:: doc-deps asciidoc-manual:: doc-deps
asciidoc-manual:: $(ASCIIDOC_MANUAL_FILES) asciidoc-manual:: $(ASCIIDOC_MANUAL_FILES)
$(call erlang,$(call asciidoc2man.erl,$?)) $(gen_verbose) $(call erlang,$(call asciidoc2man.erl,$?))
$(foreach s,$(MAN_SECTIONS),mkdir -p doc/man$s/ && mv doc/src/manual/*.$s.gz doc/man$s/;) $(verbose) $(foreach s,$(MAN_SECTIONS),mkdir -p doc/man$s/ && mv doc/src/manual/*.$s.gz doc/man$s/;)
install-docs:: install-asciidoc install-docs:: install-asciidoc