aboutsummaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2019-05-08 16:17:51 +1000
committerStewart Smith <stewart@linux.ibm.com>2019-05-15 16:22:23 +1000
commitbb408ca82fa842e5dfebed6035ca72cb28de953f (patch)
tree302079dd8593f6d3eca0d2d2f338129de3673d20 /Makefile.rules
parentfb447636f18cc6e928425a58e6837130bc4c038c (diff)
downloadskiboot-bb408ca82fa842e5dfebed6035ca72cb28de953f.zip
skiboot-bb408ca82fa842e5dfebed6035ca72cb28de953f.tar.gz
skiboot-bb408ca82fa842e5dfebed6035ca72cb28de953f.tar.bz2
build: allow per-directory flag additions and subtractions
Expand the existing per-file flags. This will be used in future changes. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.rules b/Makefile.rules
index e5f6dfc..11b0e5e 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)