From e8e9490b566563d0991ddf7f14cd2e0958ee5ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel.bylica@imapp.pl>
Date: Fri, 30 Jan 2015 11:20:56 +0100
Subject: [PATCH] Disable RTTI for evmjit library

---
 CMakeLists.txt               | 6 +++---
 libevmjit-cpp/CMakeLists.txt | 5 +++++
 libevmjit/CMakeLists.txt     | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a449f9a60..05a918ad0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,12 +4,12 @@ project(evmjit)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
 else()
-	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra -fPIC")
+	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra")
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 	# Do not allow unresovled symbols in shared library (default on linux)
 	set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
 endif()
diff --git a/libevmjit-cpp/CMakeLists.txt b/libevmjit-cpp/CMakeLists.txt
index 58375e4ee..53448332b 100644
--- a/libevmjit-cpp/CMakeLists.txt
+++ b/libevmjit-cpp/CMakeLists.txt
@@ -9,6 +9,11 @@ set(SOURCES
 )
 source_group("" FILES ${SOURCES})
 
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+else()
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # add PIC for archive
+endif()
+
 add_library(${TARGET_NAME} ${SOURCES})
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "libs")
 
diff --git a/libevmjit/CMakeLists.txt b/libevmjit/CMakeLists.txt
index f062c65e6..f88a5468b 100644
--- a/libevmjit/CMakeLists.txt
+++ b/libevmjit/CMakeLists.txt
@@ -6,9 +6,9 @@ set(INTERFACE_HEADERS interface.h)
 source_group("" FILES ${HEADERS})
 source_group("" FILES ${SOURCES})
 
-if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-	# Disable rtti for Cache as LLVM has no rtti
-	set_source_files_properties(Cache.cpp PROPERTIES COMPILE_FLAGS -fno-rtti)
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+else()
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 endif()