From fd6611bb4ba148ca316573f5d8357a8e9b65a37f Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Fri, 15 Feb 2019 17:32:09 +0000 Subject: [PATCH] bgpd: fix automake fart under MSAN "When building without VNC, automake sees that the `bgpd_bgpd_CFLAGS` variable exists, although it is only set in the VNC-enabled case... but since the variable exists, it unconditionally drops `AM_CFLAGS` for the two bgp targets and uses `bgpd_bgpd_CFLAGS` instead, which will contain... _nothing_." This was breaking builds of bgpd binaries with MSAN enabled. Signed-off-by: David Lamparter Signed-off-by: Quentin Young --- bgpd/subdir.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bgpd/subdir.am b/bgpd/subdir.am index 40ea976634..aed2939d3e 100644 --- a/bgpd/subdir.am +++ b/bgpd/subdir.am @@ -191,12 +191,15 @@ noinst_HEADERS += \ bgpd_bgpd_SOURCES = bgpd/bgp_main.c bgpd_bgp_btoa_SOURCES = bgpd/bgp_btoa.c +bgpd_bgpd_CFLAGS = $(AM_CFLAGS) +bgpd_bgp_btoa_CFLAGS = $(AM_CFLAGS) + if ENABLE_BGP_VNC bgpd_bgpd_SOURCES += bgpd/rfapi/rfapi_descriptor_rfp_utils.c -bgpd_bgpd_CFLAGS = $(AM_CFLAGS) -Irfapi -I@top_srcdir@/$(RFPINC) +bgpd_bgpd_CFLAGS += -Irfapi -I@top_srcdir@/$(RFPINC) bgpd_bgp_btoa_SOURCES += bgpd/rfapi/rfapi_descriptor_rfp_utils.c -bgpd_bgp_btoa_CFLAGS = $(AM_CFLAGS) -Irfapi -I@top_srcdir@/$(RFPINC) +bgpd_bgp_btoa_CFLAGS += -Irfapi -I@top_srcdir@/$(RFPINC) endif # RFPLDADD is set in bgpd/rfp-example/librfp/subdir.am -- 2.39.5