RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #15957 from maribu/features_required_any_order_fix

Browse Source 
build system: fix FEATURES_REQUIRED_ANY
This commit is contained in:
Marian Buschsieweke 2021-02-09 17:34:25 +01:00 committed by GitHub
commit 633dc78fa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makefiles/features_check.inc.mk
View File

@ -32,10 +32,9 @@ FEATURES_USABLE := $(filter-out $(FEATURES_BLACKLIST),$(FEATURES_PROVIDED))
FEATURES_REQUIRED_ONE_OUT_OF := $(foreach item,\
$(FEATURES_REQUIRED_ANY),\
$(word 1,\
$(filter $(subst |, ,$(item)),\
$(FEATURES_USED_SO_FAR) \
$(FEATURES_USABLE)) \
$(item)))
$(filter $(FEATURES_USED_SO_FAR) $(FEATURES_USABLE),\
$(subst |, ,$(item)))\
$(item)))
# Features that are required by the application but not provided by the BSP
# Having features missing may case the build to fail.