summaryrefslogtreecommitdiffstats
path: root/build-root/Makefile
diff options
context:
space:
mode:
authorNeale Ranns <neale.ranns@cisco.com>2018-01-10 07:27:17 -0800
committerNeale Ranns <neale.ranns@cisco.com>2018-01-10 07:27:17 -0800
commit5ee623e789261552eb9460be10f34793d40b6575 (patch)
tree5f37ae0db3bf3279613562fc88a10e048de7550b /build-root/Makefile
parentb59bd659388db62b60a4fb887ce272989d7c340c (diff)
makefile set CXXFLAGS so they are propageted to sub-builds
Change-Id: I55d9953851062f7106c66701d46bcd9073cf1ee4 Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
Diffstat (limited to 'build-root/Makefile')
-rw-r--r--build-root/Makefile4
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), \