[llvm-commits] [llvm] r165654 - in /llvm/trunk/lib: Support/CMakeLists.txt Support/Makefile VMCore/CMakeLists.txt VMCore/Makefile

[Sean Silva]

Author: silvas
Date: Wed Oct 10 15:50:36 2012
New Revision: 165654

URL: http://llvm.org/viewvc/llvm-project?rev=165654&view=rev
Log:
Revert r165652: "Remove unnecessary RTTI from the build."

... Apparently the RTTI is still necessary for some reason.

Modified:
    llvm/trunk/lib/Support/CMakeLists.txt
    llvm/trunk/lib/Support/Makefile
    llvm/trunk/lib/VMCore/CMakeLists.txt
    llvm/trunk/lib/VMCore/Makefile

Modified: llvm/trunk/lib/Support/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/CMakeLists.txt?rev=165654&r1=165653&r2=165654&view=diff
==============================================================================
--- llvm/trunk/lib/Support/CMakeLists.txt (original)
+++ llvm/trunk/lib/Support/CMakeLists.txt Wed Oct 10 15:50:36 2012
@@ -1,3 +1,5 @@
+## FIXME: This only requires RTTI because tblgen uses it.  Fix that.
+set(LLVM_REQUIRES_RTTI 1)
 if( MINGW )
   set(LLVM_REQUIRES_EH 1)
 endif()

Modified: llvm/trunk/lib/Support/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Makefile?rev=165654&r1=165653&r2=165654&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Makefile (original)
+++ llvm/trunk/lib/Support/Makefile Wed Oct 10 15:50:36 2012
@@ -11,6 +11,9 @@
 LIBRARYNAME = LLVMSupport
 BUILD_ARCHIVE = 1
 
+## FIXME: This only requires RTTI because tblgen uses it.  Fix that.
+REQUIRES_RTTI = 1
+
 EXTRA_DIST = Unix Win32 README.txt
 
 include $(LEVEL)/Makefile.common

Modified: llvm/trunk/lib/VMCore/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/CMakeLists.txt?rev=165654&r1=165653&r2=165654&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/CMakeLists.txt (original)
+++ llvm/trunk/lib/VMCore/CMakeLists.txt Wed Oct 10 15:50:36 2012
@@ -1,3 +1,5 @@
+set(LLVM_REQUIRES_RTTI 1)
+
 add_llvm_library(LLVMCore
   AsmWriter.cpp
   Attributes.cpp

Modified: llvm/trunk/lib/VMCore/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Makefile?rev=165654&r1=165653&r2=165654&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Makefile (original)
+++ llvm/trunk/lib/VMCore/Makefile Wed Oct 10 15:50:36 2012
@@ -9,6 +9,7 @@
 LEVEL = ../..
 LIBRARYNAME = LLVMCore
 BUILD_ARCHIVE = 1
+REQUIRES_RTTI = 1
 
 BUILT_SOURCES = $(PROJ_OBJ_ROOT)/include/llvm/Intrinsics.gen