[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 2/4] rules.mak: support C++ compiling and linking
From: |
Claudio Fontana |
Subject: |
[Qemu-devel] [RFC 2/4] rules.mak: support C++ compiling and linking |
Date: |
Wed, 11 Sep 2013 15:02:45 +0200 |
User-agent: |
Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 |
support compilation of .cc and .cpp files,
and if C++ is enabled always link with C++ in the non-libtool case.
Signed-off-by: Claudio Fontana <address@hidden>
---
rules.mak | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/rules.mak b/rules.mak
index 4499745..d2f1b1f 100644
--- a/rules.mak
+++ b/rules.mak
@@ -8,9 +8,14 @@ MAKEFLAGS += -rR
%.d:
%.h:
%.c:
+%.cc:
+%.cpp:
%.m:
%.mak:
+# 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
@@ -21,11 +26,21 @@ QEMU_INCLUDES += -I$(<D) -I$(@D)
$(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS)
$(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@")
%.o: %.rc
$(call quiet-command,$(WINDRES) -I. -o $@ $<," RC $(TARGET_DIR)$@")
+%.o: %.cc
+ $(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS)
$(QEMU_DGFLAGS) $(CXXFLAGS) -c -o $@ $<, " CXX $(TARGET_DIR)$@")
+%.o: %.cpp
+ $(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS)
$(QEMU_DGFLAGS) $(CXXFLAGS) -c -o $@ $<, " CXX $(TARGET_DIR)$@")
ifeq ($(LIBTOOL),)
-LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
- $(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \
- $(LIBS)," LINK $(TARGET_DIR)$@")
+ ifeq ($(CXX),)
+ LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
+ $(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \
+ $(LIBS)," LINK $(TARGET_DIR)$@")
+ else
+ LINK = $(call quiet-command,$(CXX) $(QEMU_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS)
-o $@ \
+ $(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \
+ $(LIBS)," LINK $(TARGET_DIR)$@")
+ endif
else
LIBTOOL += $(if $(V),,--quiet)
%.lo: %.c
@@ -70,7 +85,8 @@ quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1))
cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \
>/dev/null 2>&1 && echo OK), $2, $3)
-VPATH_SUFFIXES = %.c %.h %.S %.m %.mak %.texi %.sh %.rc
+VPATH_SUFFIXES = %.c %.h %.S %.cpp %.cc %.m %.mak %.texi %.sh %.rc
+
set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath
$(PATTERN) $1)))
# find-in-path
--
1.8.1
- [Qemu-devel] [RFC 0/4] ARM aarch64 disas output libvixl support, Claudio Fontana, 2013/09/11
- [Qemu-devel] [RFC 1/4] configure: add c++ compiler support, Claudio Fontana, 2013/09/11
- [Qemu-devel] [RFC 2/4] rules.mak: support C++ compiling and linking,
Claudio Fontana <=
- [Qemu-devel] [RFC 4/4] disas: implement host disassembly output for aarch64, Claudio Fontana, 2013/09/11
- Re: [Qemu-devel] [RFC 0/4] ARM aarch64 disas output libvixl support, Andreas Färber, 2013/09/11
- Re: [Qemu-devel] [RFC 0/4] ARM aarch64 disas output libvixl support, Peter Maydell, 2013/09/11
- [Qemu-devel] [RFC 3/4] disas: add libvixl source code for aarch64, Claudio Fontana, 2013/09/11
- [Qemu-devel] [RFC 3/4] disas: add libvixl source code for aarch64, Claudio Fontana, 2013/09/11
- Re: [Qemu-devel] [RFC 0/4] ARM aarch64 disas output libvixl support, Rob Landley, 2013/09/15