riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build system: fix feature resolution

Browse Source 
Fix FEATURES_REQUIRED_ANY using more features than needed.
This commit is contained in:
Marian Buschsieweke 2021-02-09 21:22:01 +01:00
parent 6929577c76
commit 47035fbc2a
No known key found for this signature in database
GPG Key ID: 61F64C6599B1539F
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefiles/features_check.inc.mk
View File

@ -32,8 +32,8 @@ FEATURES_USABLE := $(filter-out $(FEATURES_BLACKLIST),$(FEATURES_PROVIDED))
FEATURES_REQUIRED_ONE_OUT_OF := $(foreach item,\ FEATURES_REQUIRED_ONE_OUT_OF := $(foreach item,\
$(FEATURES_REQUIRED_ANY),\ $(FEATURES_REQUIRED_ANY),\
$(word 1,\ $(word 1,\
$(filter $(FEATURES_USED_SO_FAR) $(FEATURES_USABLE),\ $(filter $(FEATURES_USED_SO_FAR),$(subst |, ,$(item)))\
$(subst |, ,$(item)))\ $(filter $(FEATURES_USABLE),$(subst |, ,$(item)))\
$(item))) $(item)))
# Features that are required by the application but not provided by the BSP # Features that are required by the application but not provided by the BSP