[vmkit-commits] [vmkit] r180552 - ./configure detects CXXFLAG -fno-rtti on LLVM build.

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:22:38 2013
New Revision: 180552

URL: http://llvm.org/viewvc/llvm-project?rev=180552&view=rev
Log:
./configure detects CXXFLAG -fno-rtti on LLVM build.

If the CXXFLAG -fno-rtti is reported by llvm-config --cxxflags then compile VMKIT with -fno-rtti. VMKit was always compiled with -fno-rtti. To compile LLVM with rtti support, build LLVM with: make REQUIRES_RTTI=1
(cherry picked from commit 14c0582b7c90b13d9601fba2e1482d5317fba710)

Modified:
    vmkit/trunk/Makefile.common.in
    vmkit/trunk/Makefile.rules
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/configure

Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=180552&r1=180551&r2=180552&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Thu Apr 25 12:22:38 2013
@@ -19,6 +19,8 @@ CONFIG_HEADERS=@ac_config_headers@
 ###############################################################################
 MMTK_PLAN = @MMTK_PLAN@
 
+LLVM_RTTI = @LLVM_RTTI@
+
 CLASSPATH_IMPL = @classpathimpl@
 
 ifeq ($(CLASSPATH_IMPL),gnuclasspath)

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=180552&r1=180551&r2=180552&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu Apr 25 12:22:38 2013
@@ -56,8 +56,8 @@ COMMON_CFLAGS+= $(INCLUDES) -ansi -pedan
 								-D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS \
 								-fno-strict-aliasing -fno-omit-frame-pointer -fvisibility-inlines-hidden 
 
-CFLAGS+=$(COMMON_CFLAGS) 
-CXXFLAGS+=$(COMMON_CFLAGS) -Woverloaded-virtual -Wcast-qual -fno-rtti -fno-exceptions
+CFLAGS+=$(COMMON_CFLAGS)
+CXXFLAGS+=$(COMMON_CFLAGS) -Woverloaded-virtual -Wcast-qual -fno-exceptions $(LLVM_RTTI)
 LDFLAGS+=$(COMMON_CFLAGS) $(shell $(LLVM_CONFIG) --ldflags) $(LDOPT)
 SHOPT+=$(COMMON_CFLAGS)
 LIBS+=$(shell $(LLVM_CONFIG) --libs) -lz

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=180552&r1=180551&r2=180552&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Thu Apr 25 12:22:38 2013
@@ -347,7 +347,10 @@ if test -z ${LLVM_CONFIG}; then
     AC_MSG_ERROR([Unable to find llvm-config, please specify its path])
 fi
 
+LLVM_RTTI=$(if $LLVM_CONFIG --cxxflags|grep "\-fno-rtti" > /dev/null 2>&1;then echo -fno-rtti;fi)
+
 AC_SUBST([LLVM_CONFIG])
+AC_SUBST([LLVM_RTTI])
 
 dnl Find the install program
 AC_PROG_INSTALL

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=180552&r1=180551&r2=180552&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Thu Apr 25 12:22:38 2013
@@ -640,6 +640,7 @@ CC
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+LLVM_RTTI
 LLVM_CONFIG
 ZIP
 JAVAC
@@ -3591,6 +3592,9 @@ if test -z ${LLVM_CONFIG}; then
     as_fn_error $? "Unable to find llvm-config, please specify its path" "$LINENO" 5
 fi
 
+LLVM_RTTI=$(if $LLVM_CONFIG --cxxflags|grep "\-fno-rtti" > /dev/null 2>&1;then echo -fno-rtti;fi)
+
+
 
 
 # Find a good install program.  We prefer a C program (faster),