Merge pull request #12041 from cladmi/pr/makefiles/info_global/featur…

…es_conflict makefiles/info-global.inc.mk: bug: handle FEATURES_CONFLICT value
RIOT-OS · Aug 21, 2019 · dcc20d7 · dcc20d7
2 parents e7957e6 + 8c0120a
commit dcc20d7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/makefiles/info-global.inc.mk b/makefiles/info-global.inc.mk
@@ -5,6 +5,8 @@ USEMODULE_GLOBAL := $(USEMODULE)
 USEPKG_GLOBAL := $(USEPKG)
 FEATURES_REQUIRED_GLOBAL := $(FEATURES_REQUIRED)
 FEATURES_OPTIONAL_GLOBAL := $(FEATURES_OPTIONAL)
+FEATURES_CONFLICT_GLOBAL := $(FEATURES_CONFLICT)
+FEATURES_CONFLICT_MSG_GLOBAL := $(FEATURES_MSG_CONFLICT)
 DISABLE_MODULE_GLOBAL := $(DISABLE_MODULE)
 
 define board_missing_features
@@ -14,6 +16,8 @@ define board_missing_features
   DISABLE_MODULE    := $(DISABLE_MODULE_GLOBAL)
   FEATURES_REQUIRED := $(FEATURES_REQUIRED_GLOBAL)
   FEATURES_OPTIONAL := $(FEATURES_OPTIONAL_GLOBAL)
+  FEATURES_CONFLICT := $(FEATURES_CONFLICT_GLOBAL)
+  FEATURES_CONFLICT_MSG := $(FEATURES_CONFLICT_MSG_GLOBAL)
 
   # Remove board specific variables set by Makefile.features/Makefile.dep
   FEATURES_PROVIDED :=