From 47035fbc2a33276e8c9328bae1a0959379dfed47 Mon Sep 17 00:00:00 2001
From: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
Date: Tue, 9 Feb 2021 21:22:01 +0100
Subject: [PATCH] build system: fix feature resolution

Fix FEATURES_REQUIRED_ANY using more features than needed.
---
 makefiles/features_check.inc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/makefiles/features_check.inc.mk b/makefiles/features_check.inc.mk
index 90b443bb36..abca2fb644 100644
--- a/makefiles/features_check.inc.mk
+++ b/makefiles/features_check.inc.mk
@@ -32,8 +32,8 @@ FEATURES_USABLE := $(filter-out $(FEATURES_BLACKLIST),$(FEATURES_PROVIDED))
 FEATURES_REQUIRED_ONE_OUT_OF := $(foreach item,\
                                   $(FEATURES_REQUIRED_ANY),\
                                   $(word 1,\
-                                    $(filter $(FEATURES_USED_SO_FAR) $(FEATURES_USABLE),\
-                                             $(subst |, ,$(item)))\
+                                    $(filter $(FEATURES_USED_SO_FAR),$(subst |, ,$(item)))\
+                                    $(filter $(FEATURES_USABLE),$(subst |, ,$(item)))\
                                     $(item)))
 
 # Features that are required by the application but not provided by the BSP