aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/ci.mk
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2018-12-05 15:37:17 +0100
committerLoïc Hoguin <[email protected]>2018-12-05 17:47:32 +0100
commit385d9afa7e025cd5928cd67108d409ba1e25e8e7 (patch)
treed36ecba6c43644d2cb4836b399df3c4353157433 /plugins/ci.mk
parentbf0aa305193f0b6be6738945795cc55bd42e28fd (diff)
downloaderlang.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.
Diffstat (limited to 'plugins/ci.mk')
-rw-r--r--plugins/ci.mk4
1 files changed, 2 insertions, 2 deletions
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" "" \