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 
Includes an experimental change to avoid deleting kerl
unnecessarily and/or incorrectly.
This commit is contained in:
Loïc Hoguin 2018-05-22 17:48:34 +02:00
parent 633aa89f00
commit 15ed6df51a
No known key found for this signature in database
GPG key ID: 8A9DF795F6FED764
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
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 = 9fff0a1 ERLANG_MK_VERSION = 2018.05.15-1-g9fff0a1-dirty
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.