diff options
| author | Jerome Forissier <jerome.forissier@linaro.org> | 2016-02-26 09:59:55 +0100 |
|---|---|---|
| committer | Jerome Forissier <jerome.forissier@linaro.org> | 2016-02-29 11:02:47 +0100 |
| commit | 025989149a820b42da255116251d4b9a4515741d (patch) | |
| tree | efc65c7dc2a781a32755b459a0f960be5cf82071 /mk/compile.mk | |
| parent | 6b7848e9df1b41ecce35f15cf424f12047680a60 (diff) | |
mk/compile.mk: add 'remove' flags variable for submodule
With this commit it is possible to remove a CPP/C/AS flag for the
submodule being built. For instance suppose one adds the following
to core/core.mk:
cflags-remove-core += -pedantic
...then the '-pedantic' flag will be stripped off from the command
line when building any C file of the TEE core.
Previously, one could remove flags only on a global basis or for a
single file.
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'mk/compile.mk')
| -rw-r--r-- | mk/compile.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mk/compile.mk b/mk/compile.mk index 7a587e22..3d381960 100644 --- a/mk/compile.mk +++ b/mk/compile.mk @@ -70,6 +70,7 @@ cleanfiles := $$(cleanfiles) $$(comp-dep-$2) $$(comp-cmd-file-$2) $2 ifeq ($$(filter %.c,$1),$1) comp-q-$2 := CC comp-flags-$2 = $$(filter-out $$(CFLAGS_REMOVE) $$(cflags-remove) \ + $$(cflags-remove-$$(comp-sm-$2)) \ $$(cflags-remove-$2), \ $$(CFLAGS$$(arch-bits-$$(comp-sm-$2))) $$(CFLAGS_WARNS) \ $$(comp-cflags$$(comp-sm-$2)) $$(cflags$$(comp-sm-$2)) \ @@ -83,6 +84,7 @@ endif else ifeq ($$(filter %.S,$1),$1) comp-q-$2 := AS comp-flags-$2 = -DASM=1 $$(filter-out $$(AFLAGS_REMOVE) $$(aflags-remove) \ + $$(aflags-remove-$$(comp-sm-$2)) \ $$(aflags-remove-$2), \ $$(AFLAGS) $$(comp-aflags$$(comp-sm-$2)) \ $$(aflags$$(comp-sm-$2)) $$(aflags-$2)) @@ -92,7 +94,8 @@ $$(error "Don't know what to do with $1") endif comp-cppflags-$2 = $$(filter-out $$(CPPFLAGS_REMOVE) $$(cppflags-remove) \ - $$(cppflags-remove-$2), \ + $$(cppflags-remove-$$(comp-sm-$2)) \ + $$(cppflags-remove-$2), \ $$(nostdinc$$(comp-sm-$2)) $$(CPPFLAGS) \ $$(addprefix -I,$$(incdirs$$(comp-sm-$2))) \ $$(addprefix -I,$$(incdirs-lib$$(comp-lib-$2))) \ @@ -163,13 +166,15 @@ comp-sm-$3 := $(sm) cleanfiles := $$(cleanfiles) $$(comp-dep-$3) $$(comp-cmd-file-$3) $3 $2 comp-flags-$3 = $$(filter-out $$(CFLAGS_REMOVE) $$(cflags-remove) \ + $$(cflags-remove-$$(comp-sm-$3)) \ $$(cflags-remove-$3), \ $$(CFLAGS) $$(CFLAGS_WARNS) \ $$(comp-cflags$$(comp-sm-$3)) $$(cflags$$(comp-sm-$3)) \ $$(cflags-lib$$(comp-lib-$3)) $$(cflags-$3)) comp-cppflags-$3 = $$(filter-out $$(CPPFLAGS_REMOVE) $$(cppflags-remove) \ - $$(cppflags-remove-$3), \ + $$(cppflags-remove-$$(comp-sm-$3)) \ + $$(cppflags-remove-$3), \ $$(nostdinc$$(comp-sm-$3)) $$(CPPFLAGS) \ $$(addprefix -I,$$(incdirs$$(comp-sm-$3))) \ $$(addprefix -I,$$(incdirs-lib$$(comp-lib-$3))) \ |