From 45dad9a9d10c9ce6cf31a11079fa9b133167274a Mon Sep 17 00:00:00 2001
From: cladmi <hartergaetan@gmail.com>
Date: Wed, 11 Apr 2018 17:41:38 +0200
Subject: [PATCH] Makefile.include: check FEATURES_CONFLICT against
FEATURES_USED
The FEATURES_CONFLICT check should be done on used features to also
test for included optional features.
---
Makefile.include | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.include b/Makefile.include
index c1647a5736..a5fa29a205 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -515,11 +515,11 @@ ifneq (, $(filter all, $(if $(MAKECMDGOALS), $(MAKECMDGOALS), all)))
EXPECT_ERRORS := 1
endif
- # Test if any required feature conflict with another one.
- CONFLICT := $(foreach var,$(FEATURES_CONFLICT),$(if $(filter $(words $(subst :, ,$(var))),$(words $(filter $(FEATURES_REQUIRED),$(subst :, ,$(var))))),$(subst :, ,$(var))))
+ # Test if any used feature conflict with another one.
+ CONFLICT := $(foreach var,$(FEATURES_CONFLICT),$(if $(filter $(words $(subst :, ,$(var))),$(words $(filter $(FEATURES_USED),$(subst :, ,$(var))))),$(subst :, ,$(var))))
ifneq (, $(strip $(CONFLICT)))
$(shell $(COLOR_ECHO) "$(COLOR_YELLOW)The following features may conflict:$(COLOR_RESET)"\
- "$(COLOR_GREEN)$(sort $(filter $(FEATURES_REQUIRED), $(CONFLICT)))$(COLOR_RESET)" 1>&2)
+ "$(COLOR_GREEN)$(sort $(filter $(FEATURES_USED), $(CONFLICT)))$(COLOR_RESET)" 1>&2)
ifneq (, $(FEATURES_CONFLICT_MSG))
$(shell $(COLOR_ECHO) "$(COLOR_YELLOW)Rationale: $(COLOR_RESET)$(FEATURES_CONFLICT_MSG)" 1>&2)
endif
--
GitLab