Merge pull request #11480 from cladmi/pr/make/makefile_features_file

Makefile.features: add a common file for the features parsing
RIOT-OS · May 3, 2019 · 783d74a · 783d74a
2 parents 4c3e49e + 7d326e6
commit 783d74a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Makefile.features b/Makefile.features
@@ -0,0 +1,3 @@
+# Process FEATURES variables
+
+include $(RIOTBOARD)/$(BOARD)/Makefile.features
diff --git a/Makefile.include b/Makefile.include
@@ -245,7 +245,7 @@ export PREFIX ?= $(if $(TARGET_ARCH),$(TARGET_ARCH)-)
 INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
 
 # process provided features
-include $(RIOTBOARD)/$(BOARD)/Makefile.features
+include $(RIOTBASE)/Makefile.features
 
 # mandatory includes!
 include $(RIOTMAKE)/pseudomodules.inc.mk

diff --git a/makefiles/info-global.inc.mk b/makefiles/info-global.inc.mk
@@ -16,7 +16,9 @@ define board_missing_features
   FEATURES_OPTIONAL := $(FEATURES_OPTIONAL_GLOBAL)
   FEATURES_MISSING  :=
   FEATURES_PROVIDED :=
-  include $$(RIOTBOARD)/$(1)/Makefile.features
+
+  include $(RIOTBASE)/Makefile.features
+
   ifdef BUILDTEST_MCU_GROUP
     ifneq ($(BUILDTEST_MCU_GROUP), $$(FEATURES_MCU_GROUP))
       BOARDS_FEATURES_MISSING += "$(1) $(BUILDTEST_MCU_GROUP)"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Process FEATURES variables

		include $(RIOTBOARD)/$(BOARD)/Makefile.features