mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
makefiles/info-global.inc.mk: bug: honor DEFAULT_MODULE$
The parsing for info-boards-supported was completely ignoring default modules.
This commit is contained in:
parent
dcc20d7054
commit
4516905c0f
@ -8,12 +8,14 @@ FEATURES_OPTIONAL_GLOBAL := $(FEATURES_OPTIONAL)
|
||||
FEATURES_CONFLICT_GLOBAL := $(FEATURES_CONFLICT)
|
||||
FEATURES_CONFLICT_MSG_GLOBAL := $(FEATURES_MSG_CONFLICT)
|
||||
DISABLE_MODULE_GLOBAL := $(DISABLE_MODULE)
|
||||
DEFAULT_MODULE_GLOBAL := $(DEFAULT_MODULE)
|
||||
|
||||
define board_missing_features
|
||||
BOARD := $(1)
|
||||
USEMODULE := $(USEMODULE_GLOBAL)
|
||||
USEPKG := $(USEPKG_GLOBAL)
|
||||
DISABLE_MODULE := $(DISABLE_MODULE_GLOBAL)
|
||||
DEFAULT_MODULE := $(DEFAULT_MODULE_GLOBAL)
|
||||
FEATURES_REQUIRED := $(FEATURES_REQUIRED_GLOBAL)
|
||||
FEATURES_OPTIONAL := $(FEATURES_OPTIONAL_GLOBAL)
|
||||
FEATURES_CONFLICT := $(FEATURES_CONFLICT_GLOBAL)
|
||||
@ -29,6 +31,9 @@ define board_missing_features
|
||||
|
||||
include $(RIOTBASE)/Makefile.features
|
||||
|
||||
include $(RIOTMAKE)/defaultmodules.inc.mk
|
||||
USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
|
||||
|
||||
include $(RIOTBASE)/Makefile.dep
|
||||
|
||||
ifneq (,$$(FEATURES_MISSING))
|
||||
|
Loading…
Reference in New Issue
Block a user