aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2017-08-16 17:12:23 +0200
committerLoïc Hoguin <[email protected]>2017-08-16 17:12:23 +0200
commit05edf74e8a2860cd3beb84512f7280be8cd21e0c (patch)
tree90dd548d7faa5d27d55b22aa296972cb69b0e4a8 /core
parent7b431892bbd41a1a58dc42d82f2f246c50f6174d (diff)
downloaderlang.mk-05edf74e8a2860cd3beb84512f7280be8cd21e0c.tar.gz
erlang.mk-05edf74e8a2860cd3beb84512f7280be8cd21e0c.tar.bz2
erlang.mk-05edf74e8a2860cd3beb84512f7280be8cd21e0c.zip
More improvements to version pinning
The output of kerl will now be printed, and the way we do the recursive invocation for building the Erlang/OTP version we want should be more solid.
Diffstat (limited to 'core')
-rw-r--r--core/kerl.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/kerl.mk b/core/kerl.mk
index b815be9..1524830 100644
--- a/core/kerl.mk
+++ b/core/kerl.mk
@@ -53,27 +53,25 @@ ERLANG_HIPE ?=
# Use kerl to enforce a specific Erlang/OTP version for a project.
ifneq ($(strip $(ERLANG_OTP)),)
-export ERLANG_OTP
export PATH := $(KERL_INSTALL_DIR)/$(ERLANG_OTP)/bin:$(PATH)
$(eval $(call kerl_otp_target,$(ERLANG_OTP)))
# Build Erlang/OTP only if it doesn't already exist.
ifeq ($(wildcard $(KERL_INSTALL_DIR)/$(ERLANG_OTP))$(BUILD_ERLANG_OTP),)
$(info Building Erlang/OTP $(ERLANG_OTP)... Please wait...)
-BUILD_ERLANG_OTP := $(shell $(MAKE) $(KERL_INSTALL_DIR)/$(ERLANG_OTP) BUILD_ERLANG_OTP=1)
+$(shell $(MAKE) $(KERL_INSTALL_DIR)/$(ERLANG_OTP) ERLANG_OTP=$(ERLANG_OTP) BUILD_ERLANG_OTP=1 >&2)
endif
else
# Same for a HiPE enabled VM.
ifneq ($(strip $(ERLANG_HIPE)),)
-export ERLANG_HIPE
export PATH := $(KERL_INSTALL_DIR)/$(ERLANG_HIPE)-native/bin:$(PATH)
$(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),)
$(info Building HiPE-enabled Erlang/OTP $(ERLANG_OTP)... Please wait...)
-BUILD_ERLANG_OTP := $(shell $(MAKE) $(KERL_INSTALL_DIR)/$(ERLANG_HIPE) BUILD_ERLANG_OTP=1)
+$(shell $(MAKE) $(KERL_INSTALL_DIR)/$(ERLANG_HIPE) ERLANG_HIPE=$(ERLANG_HIPE) BUILD_ERLANG_OTP=1 >&2)
endif
endif