[Skiboot] [PATCH 3/8] build: allow per-directory flag additions and subtractions

[Nicholas Piggin]

Expand the existing per-file flags.

Signed-off-by: Nicholas Piggin <npiggin at gmail.com>
---
 Makefile.rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.rules b/Makefile.rules
index e5f6dfcf7..11b0e5ee8 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -30,11 +30,11 @@ define QTEST
 endef
 
 define cook_aflags
-       $(filter-out $(AFLAGS_SKIP_$(1)), $(CPPFLAGS) $(AFLAGS)) $(AFLAGS_$(1))
+       $(filter-out $(AFLAGS_SKIP_$(1)) $(AFLAGS_SKIP_$(dir $(1))), $(CPPFLAGS) $(AFLAGS)) $(AFLAGS_$(1)) $(AFLAGS_$(dir $(1)))
 endef
 
 define cook_cflags
-       $(filter-out $(CFLAGS_SKIP_$(1)), $(CPPFLAGS) $(CFLAGS)) $(CFLAGS_$(1))
+       $(filter-out $(CFLAGS_SKIP_$(1)) $(CFLAGS_SKIP_$(dir $(1))), $(CPPFLAGS) $(CFLAGS)) $(CFLAGS_$(1)) $(CFLAGS_$(dir $(1)))
 endef
 
 ifeq ($(C),1)
-- 
2.20.1