From 7b431892bbd41a1a58dc42d82f2f246c50f6174d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Tue, 15 Aug 2017 19:00:40 +0200 Subject: Prevent recursion when building a pinned Erlang/OTP Also add a user friendly message to inform the user of what we are doing. --- core/kerl.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/kerl.mk b/core/kerl.mk index 7846370..b815be9 100644 --- a/core/kerl.mk +++ b/core/kerl.mk @@ -58,8 +58,9 @@ 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 := $(shell $(MAKE) $(KERL_INSTALL_DIR)/$(ERLANG_OTP)) +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) endif else @@ -70,8 +71,9 @@ 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 := $(shell $(MAKE) $(KERL_INSTALL_DIR)/$(ERLANG_HIPE)) +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) endif endif -- cgit v1.2.3