From af9b2eee77cc5ac79ff647a0e3fa51f464702e31 Mon Sep 17 00:00:00 2001 From: "Hoang M. Le" Date: Tue, 21 Mar 2017 13:56:05 +0100 Subject: use METASMT_REQUIRE_RTTI flag to decide whether we need RTTI --- CMakeLists.txt | 2 +- MetaSMT.mk | 4 +++- 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 -- cgit 1.4.1