Re: [libvirt] [PATCH 3/3] tools: Enable warnings for more binaries/libs
On Thu, Nov 16, 2017 at 02:49:29PM +0100, Michal Privoznik wrote:
Because WARN_CFLAGS and COVERAGE_CFLAGS are not set globally, we
rely on each binary built to include WARN_CFLAGS/COVERAGE_CFLAGS.
But it is easy to forget those - e.g. libvirt_shell.la. However,
don't enable WARN_FLAGS (i.e. don't include AM_CFLAGS) for
wireshark plugin - parts of that code are generated and trigger
some warnings.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tools/Makefile.am | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a844dcbbc..9bbb1a838 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -25,6 +25,11 @@ INCLUDES = \
WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)
+AM_CFLAGS = \
+ $(WARN_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
It appears to me that every binary's CFLAGS variable also includes PIE_CFLAGS,
any reason for not moving them along the other ones?
+
AM_LDFLAGS = \
$(RELRO_LDFLAGS) \
$(NO_INDIRECT_LDFLAGS) \
@@ -182,8 +187,8 @@ virt_host_validate_LDADD = \
$(NULL)
virt_host_validate_CFLAGS = \
+ $(AM_CFLAGS) \
$(LIBXML_CFLAGS) \
- $(WARN_CFLAGS) \
$(PIE_CFLAGS) \
$(COVERAGE_CFLAGS) \
I believe ^this one can be dropped as well now.
$(NULL)
@@ -208,8 +213,8 @@ virt_login_shell_LDADD = \
virt_login_shell_CFLAGS = \
-DLIBVIRT_SETUID_RPC_CLIENT \
+ $(AM_CFLAGS) \
$(LIBXML_CFLAGS) \
- $(WARN_CFLAGS) \
$(PIE_CFLAGS) \
$(COVERAGE_CFLAGS)
...^here too...
@@ -241,7 +246,7 @@ virsh_LDADD = \
../src/libvirt-qemu.la \
libvirt_shell.la
virsh_CFLAGS = \
- $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
$(PIE_CFLAGS) \
$(COVERAGE_CFLAGS) \
...^here as well...
$(LIBXML_CFLAGS) \
@@ -263,7 +268,7 @@ virt_admin_LDADD = \
$(LIBXML_LIBS) \
$(NULL)
virt_admin_CFLAGS = \
- $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
$(PIE_CFLAGS) \
$(COVERAGE_CFLAGS) \
...aand ^here too...
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>