Revert r165652: "Remove unnecessary RTTI from the build."

... Apparently the RTTI is still necessary for some reason. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165654 91177308-0d34-0410-b5e6-96231b3b80d8
hylsd · Oct 10, 2012 · d2139c4 · d2139c4
1 parent ef31271
commit d2139c4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt
@@ -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()

diff --git a/lib/Support/Makefile b/lib/Support/Makefile
@@ -11,6 +11,9 @@ LEVEL = ../..
 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

diff --git a/lib/VMCore/CMakeLists.txt b/lib/VMCore/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(LLVM_REQUIRES_RTTI 1)
+
 add_llvm_library(LLVMCore
   AsmWriter.cpp
   Attributes.cpp

diff --git a/lib/VMCore/Makefile b/lib/VMCore/Makefile
@@ -9,6 +9,7 @@
 LEVEL = ../..
 LIBRARYNAME = LLVMCore
 BUILD_ARCHIVE = 1
+REQUIRES_RTTI = 1
 
 BUILT_SOURCES = $(PROJ_OBJ_ROOT)/include/llvm/Intrinsics.gen