about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--MetaSMT.mk4
2 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff55ad23..b0f5fd26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -394,7 +394,7 @@ endif()
 # RTTI
 ###############################################################################
 if (NOT LLVM_ENABLE_RTTI)
-  if (ENABLE_SOLVER_METASMT)
+  if (ENABLE_SOLVER_METASMT AND metaSMT_REQUIRE_RTTI)
     message(WARNING "Not disabling RTTI because metaSMT uses them")
     # FIXME: Should this be FATAL_ERROR rather than ERROR?
     message(WARNING
diff --git a/MetaSMT.mk b/MetaSMT.mk
index 817fa663..32f60ac0 100644
--- a/MetaSMT.mk
+++ b/MetaSMT.mk
@@ -8,6 +8,8 @@ ifeq ($(ENABLE_METASMT),1)
   CXX.Flags += $(metaSMT_CXXFLAGS)
   CXX.Flags += $(metaSMT_INCLUDES)
   CXX.Flags := $(filter-out -fno-exceptions,$(CXX.Flags))
-  CXX.Flags := $(filter-out -fno-rtti,$(CXX.Flags))
+  ifeq ($(metaSMT_REQUIRE_RTTI),true)
+    CXX.Flags := $(filter-out -fno-rtti,$(CXX.Flags))
+  endif  
   LIBS += $(metaSMT_LDLIBS)
 endif