[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-4.0 4/7] qga-win: fix VSS build breakage due to u
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PULL for-4.0 4/7] qga-win: fix VSS build breakage due to unintended gnu99 C++ flag |
Date: |
Mon, 18 Mar 2019 11:24:07 -0500 |
Commit 7be41675f7c set -std=gnu99 for C code via QEMU_CFLAGS. Currently
we generate a "custom" QEMU_CXXFLAGS for VSS DLL C++ build by
filtering out some options from QEMU_CFLAGS and adding some others.
Since we don't filter out -std=gnu99 currently this breaks builds when
VSS support is enabled.
We could keep the existing approach, filter out -std=gnu99 from
QEMU_CFLAGS, and add -std=gnu++98, like configure currently does for
QEMU_CXXFLAGS, but as it turns out our resulting QEMU_CXXFLAGS would
be exactly what configure already generates, just with these filtered
out:
-fstack-protector-all -fstack-protector-strong
and these added:
-Wno-unknown-pragmas -Wno-delete-non-virtual-dtor
So fix the issue by re-using configure-generated QEMU_CXXFLAGS and
just handling these specific changes.
Signed-off-by: Michael Roth <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
qga/vss-win32/Makefile.objs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qga/vss-win32/Makefile.objs b/qga/vss-win32/Makefile.objs
index dad9d1b0ba..fd3ba1896b 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
-fstack-protector-strong, $(QEMU_CFLAGS)) -Wno-unknown-pragmas
-Wno-delete-non-virtual-dtor
+$(obj-qga-vss-dll-obj-y): QEMU_CXXFLAGS := $(filter-out -fstack-protector-all
-fstack-protector-strong, $(QEMU_CXXFLAGS)) -Wno-unknown-pragmas
-Wno-delete-non-virtual-dtor
$(obj)/qga-vss.dll: LDFLAGS = -shared
-Wl,--add-stdcall-alias,--enable-stdcall-fixup -lglib-2.0 -lole32 -loleaut32
-lshlwapi -luuid -lintl -lws2_32 -static
$(obj)/qga-vss.dll: $(obj-qga-vss-dll-obj-y) $(SRC_PATH)/$(obj)/qga-vss.def
--
2.17.1
- [Qemu-devel] [PULL for-4.0 0/7] qemu-ga patch queue for 4.0, Michael Roth, 2019/03/18
- [Qemu-devel] [PULL for-4.0 2/7] qga-win: Adding support for Windows Server 2019 get-osinfo command, Michael Roth, 2019/03/18
- [Qemu-devel] [PULL for-4.0 4/7] qga-win: fix VSS build breakage due to unintended gnu99 C++ flag,
Michael Roth <=
- [Qemu-devel] [PULL for-4.0 3/7] qga-win: include glib when building VSS DLL, Michael Roth, 2019/03/18
- [Qemu-devel] [PULL for-4.0 6/7] qga: process_event() simplification, Michael Roth, 2019/03/18
- [Qemu-devel] [PULL for-4.0 7/7] qmp: common 'id' handling & make QGA conform to QMP spec, Michael Roth, 2019/03/18
- [Qemu-devel] [PULL for-4.0 1/7] qga: update docs with systemd suspend support info, Michael Roth, 2019/03/18
- [Qemu-devel] [PULL for-4.0 5/7] qga: Fix guest-get-fsinfo PCI address collection in Windows, Michael Roth, 2019/03/18
- Re: [Qemu-devel] [PULL for-4.0 0/7] qemu-ga patch queue for 4.0, no-reply, 2019/03/18
- Re: [Qemu-devel] [PULL for-4.0 0/7] qemu-ga patch queue for 4.0, Peter Maydell, 2019/03/19