summaryrefslogtreecommitdiffstats
path: root/vtysh
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2018-06-08 18:39:31 +0200
committerQuentin Young <qlyoung@cumulusnetworks.com>2018-06-08 19:22:13 +0200
commite9f272a49eb36d8aad77e772135f47509a2425bd (patch)
tree55df9dccfcf4a48e845dcef4d1e517536ffa5b45 /vtysh
parentMerge pull request #2390 from pacovn/Coverity_1221459_Use_after_free (diff)
downloadfrr-e9f272a49eb36d8aad77e772135f47509a2425bd.tar.xz
frr-e9f272a49eb36d8aad77e772135f47509a2425bd.zip
*: disable all sanitizers for clippy build
* Move configure flag propagations out of user flags * Use AC_SUBST to transfer flag values to Automake * Set default AM_CFLAGS and AM_CPPFLAGS in common.am and change child Makefiles to modify these base variables * Add flag override to turn off all sanitizers when building clippy * Remove LSAN suppressions blacklist as it's no longer needed Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'vtysh')
-rw-r--r--vtysh/Makefile.am5
1 files changed, 2 insertions, 3 deletions
diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
index d82f9fd1b..5d6f890e9 100644
--- a/vtysh/Makefile.am
+++ b/vtysh/Makefile.am
@@ -1,5 +1,6 @@
## Process this file with Automake to create Makefile.in
+include ../common.am
if ENABLE_BGP_VNC
BGP_VNC_RFP_SRCDIR = @top_srcdir@/@LIBRFP@
@@ -16,14 +17,12 @@ BGP_VNC_RFAPI_INCDIR =
BGP_VNC_RFAPI_SRCDIR =
BGP_VNC_RFAPI_SRC =
endif
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib \
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib \
$(BGP_VNC_RFAPI_INCDIR) $(BGP_VNC_RFP_INCDIR)
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
LIBS = @LIBS@ @CURSES@ @LIBPAM@
-AM_CFLAGS = $(WERROR)
-
bin_PROGRAMS = vtysh
vtysh_SOURCES = vtysh_main.c vtysh.c vtysh_user.c vtysh_config.c