From c399c753d9f22da10d06d2fa5e37e9ebad7bf665 Mon Sep 17 00:00:00 2001 From: Sean Silva Date: Wed, 10 Oct 2012 20:50:36 +0000 Subject: Revert r165652: "Remove unnecessary RTTI from the build." ... Apparently the RTTI is still necessary for some reason. llvm-svn: 165654 --- llvm/lib/Support/CMakeLists.txt | 2 ++ llvm/lib/Support/Makefile | 3 +++ llvm/lib/VMCore/CMakeLists.txt | 2 ++ llvm/lib/VMCore/Makefile | 1 + 4 files changed, 8 insertions(+) (limited to 'llvm/lib') diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt index 3b31785e09a..83baf60d040 100644 --- a/llvm/lib/Support/CMakeLists.txt +++ b/llvm/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/llvm/lib/Support/Makefile b/llvm/lib/Support/Makefile index 4a2185d589e..d68e500ca5f 100644 --- a/llvm/lib/Support/Makefile +++ b/llvm/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/llvm/lib/VMCore/CMakeLists.txt b/llvm/lib/VMCore/CMakeLists.txt index c2a4ee3aae1..6c309679740 100644 --- a/llvm/lib/VMCore/CMakeLists.txt +++ b/llvm/lib/VMCore/CMakeLists.txt @@ -1,3 +1,5 @@ +set(LLVM_REQUIRES_RTTI 1) + add_llvm_library(LLVMCore AsmWriter.cpp Attributes.cpp diff --git a/llvm/lib/VMCore/Makefile b/llvm/lib/VMCore/Makefile index 8b9865152e2..2b9b0f258cf 100644 --- a/llvm/lib/VMCore/Makefile +++ b/llvm/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 -- cgit v1.2.3