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 | |
| 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)
| -rw-r--r-- | build-data/platforms/vpp.mk | 3 | ||||
| -rw-r--r-- | build-root/Makefile | 4 | ||||
| -rw-r--r-- | src/vpp-api/vom/Makefile.am | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index 9f01a656e0b..320609ded2b 100644 --- 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 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), \ diff --git a/src/vpp-api/vom/Makefile.am b/src/vpp-api/vom/Makefile.am index b1fbfeedb35..e7e003968b0 100644 --- 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 = |