diff options
author | Neale Ranns <neale.ranns@cisco.com> | 2018-01-10 07:27:17 -0800 |
---|---|---|
committer | Neale Ranns <nranns@cisco.com> | 2018-01-10 18:42:43 +0000 |
commit | 9a5e61d7753bec9e822f0d518c632e4b6ca7d24d (patch) | |
tree | 4b0708ba9e36531c2ad0a61a9fb0f0000e7b2d0a /build-root | |
parent | fd66de0f3112526194ecf6bd84fb23a42f359007 (diff) |
makefile set CXXFLAGS so they are propageted to sub-builds
Change-Id: I55d9953851062f7106c66701d46bcd9073cf1ee4
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
(cherry picked from commit 5ee623e789261552eb9460be10f34793d40b6575)
Diffstat (limited to 'build-root')
-rw-r--r-- | build-root/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build-root/Makefile b/build-root/Makefile index d491e71feca..af35be49580 100644 --- a/build-root/Makefile +++ b/build-root/Makefile @@ -245,6 +245,8 @@ tag_var_with_added_space_fn = $(if $($(TAG)_TAG_$(1)),$($(TAG)_TAG_$(1)) ) # TAG=debug for debugging debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \ -fstack-protector-all -fPIC +debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \ + -fstack-protector-all -fPIC debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \ -fstack-protector-all -fPIC @@ -537,6 +539,8 @@ configure_ldflags_fn = \ CONFIGURE_ENV = \ $(if $(call configure_var_fn,CPPFLAGS), \ CPPFLAGS="$(CPPFLAGS) $(call configure_var_fn,CPPFLAGS)") \ + $(if $(call configure_var_fn,CXXFLAGS), \ + CXXFLAGS="$(CXXFLAGS) $(call configure_var_fn,CXXFLAGS)") \ $(if $(call configure_var_fn,CFLAGS), \ CFLAGS="$(CFLAGS) $(call configure_var_fn,CFLAGS)") \ $(if $(call configure_var_fn,CCASFLAGS), \ |