Patchwork [RFC,v3,01/11] configure: Support configuring c++ compiler

login
register
mail settings
Submitter Tomoki Sekiyama
Date May 21, 2013, 3:33 p.m.
Message ID <20130521153338.4880.75134.stgit@hds.com>
Download mbox | patch
Permalink /patch/245323/
State New
Headers show

Comments

Tomoki Sekiyama - May 21, 2013, 3:33 p.m.
Add configuration for c++ compiler (${corss_prefix}g++ as default) in
configure and Makefiles.

Currently, usage of c++ language is only for access to Windows VSS
using COM+ services in qemu-guest-agent for Windows.

Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama@hds.com>
---
 configure |    6 ++++++
 rules.mak |    9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
Eric Blake - May 21, 2013, 4:42 p.m.
On 05/21/2013 09:33 AM, Tomoki Sekiyama wrote:
> Add configuration for c++ compiler (${corss_prefix}g++ as default) in

s/corss/cross/

> configure and Makefiles.
> 
> Currently, usage of c++ language is only for access to Windows VSS
> using COM+ services in qemu-guest-agent for Windows.
>
Peter Maydell - May 21, 2013, 4:56 p.m.
On 21 May 2013 16:33, Tomoki Sekiyama <tomoki.sekiyama@hds.com> wrote:
> Add configuration for c++ compiler (${corss_prefix}g++ as default) in
> configure and Makefiles.

I think you should follow the same logic we use for picking
the C compiler, so that we use 'c++' rather than 'g++' if
cross_prefix isn't specified. Otherwise we'll end up on MacOSX
with the odd effect of using clang for C and some ancient
compiler for C++...

> Currently, usage of c++ language is only for access to Windows VSS
> using COM+ services in qemu-guest-agent for Windows.

...which isn't important for this use, but I'm sure once configure
has support for C++ it'll spread to other uses later.

thanks
-- PMM
Tomoki Sekiyama - May 21, 2013, 9:01 p.m.
Hi Peter,

On 5/21/13 12:56 , "Peter Maydell" <peter.maydell@linaro.org> wrote:

>On 21 May 2013 16:33, Tomoki Sekiyama <tomoki.sekiyama@hds.com> wrote:
>> Add configuration for c++ compiler (${corss_prefix}g++ as default) in
>> configure and Makefiles.
>
>I think you should follow the same logic we use for picking
>the C compiler, so that we use 'c++' rather than 'g++' if
>cross_prefix isn't specified. Otherwise we'll end up on MacOSX
>with the odd effect of using clang for C and some ancient
>compiler for C++...
>
>> Currently, usage of c++ language is only for access to Windows VSS
>> using COM+ services in qemu-guest-agent for Windows.
>
>...which isn't important for this use, but I'm sure once configure
>has support for C++ it'll spread to other uses later.
>
>thanks
>-- PMM

OK, I will follow the logic for C compiler in the next version.

Thanks,
Tomoki Sekiyama - May 21, 2013, 9:02 p.m.
Hi Eric,

Thank you for the review.

On 5/21/13 12:42 , "Eric Blake" <eblake@redhat.com> wrote:

>On 05/21/2013 09:33 AM, Tomoki Sekiyama wrote:
>> Add configuration for c++ compiler (${corss_prefix}g++ as default) in
>
>s/corss/cross/

Oops, I'll fix this in next version...
(with a fix for logic to configure c++ compiler, pointed out on Peter's
mail)

>> configure and Makefiles.
>> 
>> Currently, usage of c++ language is only for access to Windows VSS
>> using COM+ services in qemu-guest-agent for Windows.

Thanks,

Patch

diff --git a/configure b/configure
index 5ae7e4a..1af2f37 100755
--- a/configure
+++ b/configure
@@ -280,6 +280,7 @@  else
   cc="${CC-${cross_prefix}gcc}"
 fi
 
+cxx="${CXX-${cross_prefix}g++}"
 ar="${AR-${cross_prefix}ar}"
 as="${AS-${cross_prefix}as}"
 cpp="${CPP-$cc -E}"
@@ -614,6 +615,8 @@  for opt do
   ;;
   --host-cc=*) host_cc="$optarg"
   ;;
+  --cxx=*) cxx="$optarg"
+  ;;
   --objcc=*) objcc="$optarg"
   ;;
   --make=*) make="$optarg"
@@ -1069,6 +1072,7 @@  echo "  --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]"
 echo "  --cc=CC                  use C compiler CC [$cc]"
 echo "  --host-cc=CC             use C compiler CC [$host_cc] for code run at"
 echo "                           build time"
+echo "  --cxx=CXX                use C++ compiler CXX [$cxx]"
 echo "  --objcc=OBJCC            use Objective-C compiler OBJCC [$objcc]"
 echo "  --extra-cflags=CFLAGS    append extra C compiler flags QEMU_CFLAGS"
 echo "  --extra-ldflags=LDFLAGS  append extra linker flags LDFLAGS"
@@ -3496,6 +3500,7 @@  fi
 echo "Source path       $source_path"
 echo "C compiler        $cc"
 echo "Host C compiler   $host_cc"
+echo "C++ compiler      $cxx"
 echo "Objective-C compiler $objcc"
 echo "CFLAGS            $CFLAGS"
 echo "QEMU_CFLAGS       $QEMU_CFLAGS"
@@ -4069,6 +4074,7 @@  echo "PYTHON=$python" >> $config_host_mak
 echo "CC=$cc" >> $config_host_mak
 echo "CC_I386=$cc_i386" >> $config_host_mak
 echo "HOST_CC=$host_cc" >> $config_host_mak
+echo "CXX=$cxx" >> $config_host_mak
 echo "OBJCC=$objcc" >> $config_host_mak
 echo "AR=$ar" >> $config_host_mak
 echo "AS=$as" >> $config_host_mak
diff --git a/rules.mak b/rules.mak
index 4499745..abc2e84 100644
--- a/rules.mak
+++ b/rules.mak
@@ -8,9 +8,13 @@  MAKEFLAGS += -rR
 %.d:
 %.h:
 %.c:
+%.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
 
@@ -50,6 +54,9 @@  endif
 %.o: %.asm
 	$(call quiet-command,$(AS) $(ASFLAGS) -o $@ $<,"  AS    $(TARGET_DIR)$@")
 
+%.o: %.cpp
+	$(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<,"  CXX   $(TARGET_DIR)$@")
+
 %.o: %.m
 	$(call quiet-command,$(OBJCC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<,"  OBJC  $(TARGET_DIR)$@")
 
@@ -70,7 +77,7 @@  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 %.m %.mak %.texi %.sh %.rc
 set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(PATTERN) $1)))
 
 # find-in-path