aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hindin <jhindin@daynix.com>2015-04-01 19:38:57 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2015-04-02 15:57:27 +0200
commit420957a5982113416c5e442687de5e1ffaffeafc (patch)
treec4f5a8277c38dd64abbaa3be217e60a38f8fd963
parentcbea0c26e718191b57783f847ad2c805670439e8 (diff)
downloadqemu-420957a5982113416c5e442687de5e1ffaffeafc.zip
qemu-420957a5982113416c5e442687de5e1ffaffeafc.tar.gz
qemu-420957a5982113416c5e442687de5e1ffaffeafc.tar.bz2
qga: fitering out -fstack-protector-strong
configure script may add -fstack-protector-strong option instead of -fstack-protector-all, depending on availability ( see commit 63678e17c ). Both options have to by filtered out for qga-vss.dll, otherwise MinGW cross-compilation fails at linking stage. Signed-off-by: Joseph Hindin <jhindin@daynix.com> Message-Id: <1427906337-20805-2-git-send-email-jhindin@daynix.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--qga/vss-win32/Makefile.objs2
1 files changed, 1 insertions, 1 deletions
diff --git a/qga/vss-win32/Makefile.objs b/qga/vss-win32/Makefile.objs
index 6a69d50..7c96c6b 100644
--- a/qga/vss-win32/Makefile.objs
+++ b/qga/vss-win32/Makefile.objs
@@ -3,7 +3,7 @@
qga-vss-dll-obj-y += requester.o provider.o install.o
obj-qga-vss-dll-obj-y = $(addprefix $(obj)/, $(qga-vss-dll-obj-y))
-$(obj-qga-vss-dll-obj-y): QEMU_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls -fstack-protector-all, $(QEMU_CFLAGS)) -Wno-unknown-pragmas -Wno-delete-non-virtual-dtor
+$(obj-qga-vss-dll-obj-y): QEMU_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls -fstack-protector-all -fstack-protector-strong, $(QEMU_CFLAGS)) -Wno-unknown-pragmas -Wno-delete-non-virtual-dtor
$(obj)/qga-vss.dll: LDFLAGS = -shared -Wl,--add-stdcall-alias,--enable-stdcall-fixup -lole32 -loleaut32 -lshlwapi -luuid -static
$(obj)/qga-vss.dll: $(obj-qga-vss-dll-obj-y) $(SRC_PATH)/$(obj)/qga-vss.def