makefile set CXXFLAGS so they are propageted to sub-builds

Change-Id: I55d9953851062f7106c66701d46bcd9073cf1ee4
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>

diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 9f01a65..320609d 100644 (file)
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -48,10 +48,13 @@ endif
 
 vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \
        -fstack-protector-all -fPIC -Werror
+vpp_debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \
+       -fstack-protector-all -fPIC -Werror
 vpp_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \
        -fstack-protector-all -fPIC -Werror
 
 vpp_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror
+vpp_TAG_CXXFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror
 vpp_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror
 
 vpp_clang_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror

diff --git a/build-root/Makefile b/build-root/Makefile
index d491e71..af35be4 100644 (file)
--- 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),                           \

diff --git a/src/vpp-api/vom/Makefile.am b/src/vpp-api/vom/Makefile.am
index b1fbfee..e7e0039 100644 (file)
--- a/src/vpp-api/vom/Makefile.am
+++ b/src/vpp-api/vom/Makefile.am
@@ -15,8 +15,7 @@ AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
 AM_LIBTOOLFLAGS = --quiet
 
-AM_CXXFLAGS = -Wall -std=gnu++11 -I${top_srcdir} -I${top_builddir}/vpp-api/vapi/ -I$(top_srcdir)/vpp-api/ -I${libdir}/../include -O0
-AM_LDFLAGS = -shared -no-undefined
+AM_CXXFLAGS = -Wall -Werror -std=gnu++11 -I${top_srcdir} -I${top_builddir}/vpp-api/vapi/ -I$(top_srcdir)/vpp-api/ -I${libdir}/../include
 
 bin_PROGRAMS =
 noinst_LTLIBRARIES =