1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00

Don't duplicate compiler warning flags when linking

Automake already passes all CFLAGS to the linker too, so it
is not necessary to set WARN_LDFLAGS in addition to the
WARN_CFLAGS variable.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-05-13 12:50:22 +01:00
parent 421846e4a3
commit 71b54636f0
4 changed files with 1 additions and 13 deletions

View File

@ -111,7 +111,6 @@ libvirtd_CFLAGS = \
-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\""
libvirtd_LDFLAGS = \ libvirtd_LDFLAGS = \
$(WARN_LDFLAGS) \
$(PIE_LDFLAGS) \ $(PIE_LDFLAGS) \
$(RELRO_LDFLAGS) \ $(RELRO_LDFLAGS) \
$(COVERAGE_LDFLAGS) $(COVERAGE_LDFLAGS)

View File

@ -224,10 +224,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
gl_WARN_ADD([-Werror]) gl_WARN_ADD([-Werror])
fi fi
WARN_LDFLAGS=$WARN_CFLAGS
AC_SUBST([WARN_CFLAGS])
AC_SUBST([WARN_LDFLAGS])
dnl Needed to keep compile quiet on python 2.4 dnl Needed to keep compile quiet on python 2.4
save_WARN_CFLAGS=$WARN_CFLAGS save_WARN_CFLAGS=$WARN_CFLAGS
WARN_CFLAGS= WARN_CFLAGS=

View File

@ -1979,7 +1979,6 @@ if WITH_LIBVIRTD
libexec_PROGRAMS += libvirt_iohelper libexec_PROGRAMS += libvirt_iohelper
libvirt_iohelper_SOURCES = $(UTIL_IO_HELPER_SOURCES) libvirt_iohelper_SOURCES = $(UTIL_IO_HELPER_SOURCES)
libvirt_iohelper_LDFLAGS = \ libvirt_iohelper_LDFLAGS = \
$(WARN_LDFLAGS) \
$(AM_LDFLAGS) \ $(AM_LDFLAGS) \
$(PIE_LDFLAGS) \ $(PIE_LDFLAGS) \
$(RELRO_LDFLAGS) \ $(RELRO_LDFLAGS) \
@ -2003,7 +2002,6 @@ libexec_PROGRAMS += libvirt_parthelper
libvirt_parthelper_SOURCES = $(STORAGE_HELPER_DISK_SOURCES) libvirt_parthelper_SOURCES = $(STORAGE_HELPER_DISK_SOURCES)
libvirt_parthelper_LDFLAGS = \ libvirt_parthelper_LDFLAGS = \
$(WARN_LDFLAGS) \
$(AM_LDFLAGS) \ $(AM_LDFLAGS) \
$(PIE_LDFLAGS) \ $(PIE_LDFLAGS) \
$(RELRO_LDFLAGS) \ $(RELRO_LDFLAGS) \
@ -2036,7 +2034,6 @@ libvirt_sanlock_helper_CFLAGS = \
$(PIE_CFLAGS) \ $(PIE_CFLAGS) \
$(NULL) $(NULL)
libvirt_sanlock_helper_LDFLAGS = \ libvirt_sanlock_helper_LDFLAGS = \
$(WARN_LDFLAGS) \
$(AM_LDFLAGS) \ $(AM_LDFLAGS) \
$(PIE_LDFLAGS) \ $(PIE_LDFLAGS) \
$(RELRO_LDFLAGS) \ $(RELRO_LDFLAGS) \
@ -2053,7 +2050,6 @@ libvirt_lxc_SOURCES = \
$(NODE_INFO_SOURCES) \ $(NODE_INFO_SOURCES) \
$(DATATYPES_SOURCES) $(DATATYPES_SOURCES)
libvirt_lxc_LDFLAGS = \ libvirt_lxc_LDFLAGS = \
$(WARN_LDFLAGS) \
$(AM_LDFLAGS) \ $(AM_LDFLAGS) \
$(PIE_LDFLAGS) \ $(PIE_LDFLAGS) \
$(RELRO_LDFLAGS) \ $(RELRO_LDFLAGS) \
@ -2098,7 +2094,6 @@ libexec_PROGRAMS += virt-aa-helper
virt_aa_helper_SOURCES = $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) virt_aa_helper_SOURCES = $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES)
virt_aa_helper_LDFLAGS = \ virt_aa_helper_LDFLAGS = \
$(WARN_LDFLAGS) \
$(AM_LDFLAGS) \ $(AM_LDFLAGS) \
$(PIE_LDFLAGS) \ $(PIE_LDFLAGS) \
$(RELRO_LDFLAGS) \ $(RELRO_LDFLAGS) \

View File

@ -98,7 +98,6 @@ virt_host_validate_SOURCES = \
$(NULL) $(NULL)
virt_host_validate_LDFLAGS = \ virt_host_validate_LDFLAGS = \
$(WARN_LDFLAGS) \
$(PIE_LDFLAGS) \ $(PIE_LDFLAGS) \
$(RELRO_LDFLAGS) \ $(RELRO_LDFLAGS) \
$(COVERAGE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \
@ -131,10 +130,9 @@ virsh_SOURCES = \
virsh-volume.c virsh-volume.h \ virsh-volume.c virsh-volume.h \
$(NULL) $(NULL)
virsh_LDFLAGS = $(WARN_LDFLAGS) $(COVERAGE_LDFLAGS) virsh_LDFLAGS = $(COVERAGE_LDFLAGS)
virsh_LDADD = \ virsh_LDADD = \
$(STATIC_BINARIES) \ $(STATIC_BINARIES) \
$(WARN_LDFLAGS) \
$(PIE_LDFLAGS) \ $(PIE_LDFLAGS) \
$(RELRO_LDFLAGS) \ $(RELRO_LDFLAGS) \
../src/libvirt.la \ ../src/libvirt.la \