diff options
| author | Loïc Hoguin <[email protected]> | 2018-12-05 15:37:17 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2018-12-05 17:47:32 +0100 |
| commit | 385d9afa7e025cd5928cd67108d409ba1e25e8e7 (patch) | |
| tree | d36ecba6c43644d2cb4836b399df3c4353157433 | |
| parent | bf0aa305193f0b6be6738945795cc55bd42e28fd (diff) | |
| download | erlang.mk-385d9afa7e025cd5928cd67108d409ba1e25e8e7.tar.gz erlang.mk-385d9afa7e025cd5928cd67108d409ba1e25e8e7.tar.bz2 erlang.mk-385d9afa7e025cd5928cd67108d409ba1e25e8e7.zip | |
Better handle ERLANG_OTP and ERLANG_HIPE
A release that gets removed in a ci:: preceding the running
of CI rules would end up not rebuilding it due to how a
warning was silenced when using ERLANG_OTP.
| -rw-r--r-- | core/kerl.mk | 18 | ||||
| -rw-r--r-- | plugins/ci.mk | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/core/kerl.mk b/core/kerl.mk index c8fdc1e..b514052 100644 --- a/core/kerl.mk +++ b/core/kerl.mk @@ -21,20 +21,20 @@ KERL_MAKEFLAGS ?= OTP_GIT ?= https://github.com/erlang/otp define kerl_otp_target -ifeq ($(wildcard $(KERL_INSTALL_DIR)/$(1)),) $(KERL_INSTALL_DIR)/$(1): $(KERL) - MAKEFLAGS="$(KERL_MAKEFLAGS)" $(KERL) build git $(OTP_GIT) $(1) $(1) - $(KERL) install $(1) $(KERL_INSTALL_DIR)/$(1) -endif + $(verbose) if [ ! -d $$@ ]; then \ + MAKEFLAGS="$(KERL_MAKEFLAGS)" $(KERL) build git $(OTP_GIT) $(1) $(1); \ + $(KERL) install $(1) $(KERL_INSTALL_DIR)/$(1); \ + fi endef define kerl_hipe_target -ifeq ($(wildcard $(KERL_INSTALL_DIR)/$1-native),) $(KERL_INSTALL_DIR)/$1-native: $(KERL) - KERL_CONFIGURE_OPTIONS=--enable-native-libs \ - MAKEFLAGS="$(KERL_MAKEFLAGS)" $(KERL) build git $(OTP_GIT) $1 $1-native - $(KERL) install $1-native $(KERL_INSTALL_DIR)/$1-native -endif + $(verbose) if [ ! -d $$@ ]; then \ + KERL_CONFIGURE_OPTIONS=--enable-native-libs \ + MAKEFLAGS="$(KERL_MAKEFLAGS)" $(KERL) build git $(OTP_GIT) $1 $1-native; \ + $(KERL) install $1-native $(KERL_INSTALL_DIR)/$1-native; \ + fi endef $(KERL): $(KERL_DIR) diff --git a/plugins/ci.mk b/plugins/ci.mk index 52cf8f3..4f62132 100644 --- a/plugins/ci.mk +++ b/plugins/ci.mk @@ -46,8 +46,8 @@ $(foreach otp,$(CI_OTP),$(eval $(call ci_target,$(otp),$(otp),otp))) $(foreach otp,$(CI_HIPE),$(eval $(call ci_target,$(otp)-native,$(otp)-native,native))) $(foreach otp,$(CI_ERLLVM),$(eval $(call ci_target,$(otp)-erllvm,$(otp)-native,erllvm))) -$(foreach otp,$(CI_OTP),$(eval $(call kerl_otp_target,$(otp)))) -$(foreach otp,$(sort $(CI_HIPE) $(CI_ERLLLVM)),$(eval $(call kerl_hipe_target,$(otp)))) +$(foreach otp,$(filter-out $(ERLANG_OTP),$(CI_OTP)),$(eval $(call kerl_otp_target,$(otp)))) +$(foreach otp,$(filter-out $(ERLANG_HIPE),$(sort $(CI_HIPE) $(CI_ERLLLVM))),$(eval $(call kerl_hipe_target,$(otp)))) help:: $(verbose) printf "%s\n" "" \ |