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

build system: fix FEATURES_REQUIRED_ANY

Browse Source 
Previously, FEATURES_REQUIRED_ANY didn't honor the order of the alternatives
provided, if none of the features were already in used and multiple options
are provided. This fixes this.
This commit is contained in:
Marian Buschsieweke 2021-02-09 10:45:03 +01:00
parent 64779b6f98
commit f41dcc9a8d
No known key found for this signature in database
GPG Key ID: 61F64C6599B1539F
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makefiles/features_check.inc.mk
View File

@ -32,9 +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 $(subst |, ,$(item)),\ $(filter $(FEATURES_USED_SO_FAR) $(FEATURES_USABLE),\
$(FEATURES_USED_SO_FAR) \ $(subst |, ,$(item)))\
$(FEATURES_USABLE)) \
$(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