summaryrefslogtreecommitdiffstats
path: root/rules.mak
diff options
context:
space:
mode:
authorPeter Maydell2017-06-12 15:14:42 +0200
committerPeter Maydell2017-06-12 15:14:42 +0200
commit2a8469aaabdc86c369bf4aeb77f87de7361f464b (patch)
treed8ed3bc0abeb328d50bd303c6617f5a800ea8385 /rules.mak
parentMerge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff)
parentconfigure: split c and cxx extra flags (diff)
downloadqemu-2a8469aaabdc86c369bf4aeb77f87de7361f464b.tar.gz
qemu-2a8469aaabdc86c369bf4aeb77f87de7361f464b.tar.xz
qemu-2a8469aaabdc86c369bf4aeb77f87de7361f464b.zip
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Wed 07 Jun 2017 19:06:51 BST # gpg: using RSA key 0x9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: configure: split c and cxx extra flags coroutine-lock: do not touch coroutine after another one has been entered .gdbinit: load QEMU sub-commands when gdb starts coccinelle: fix typo in comment oslib: strip trailing '\n' from error_setg() string argument Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'rules.mak')
-rw-r--r--rules.mak3
1 files changed, 0 insertions, 3 deletions
diff --git a/rules.mak b/rules.mak
index 1c0eabb367..2a2fb72e85 100644
--- a/rules.mak
+++ b/rules.mak
@@ -20,9 +20,6 @@ MAKEFLAGS += -rR
%.mak:
clean-target:
-# Flags for C++ compilation
-QEMU_CXXFLAGS = -D__STDC_LIMIT_MACROS $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls, $(QEMU_CFLAGS))
-
# Flags for dependency generation
QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d