about summary refs log tree commit diff homepage
path: root/unittests
diff options
context:
space:
mode:
Diffstat (limited to 'unittests')
-rw-r--r--unittests/Expr/Makefile1
-rw-r--r--unittests/Makefile4
-rw-r--r--unittests/Solver/Makefile4
3 files changed, 9 insertions, 0 deletions
diff --git a/unittests/Expr/Makefile b/unittests/Expr/Makefile
index f1cd4ec4..a9bfeda1 100644
--- a/unittests/Expr/Makefile
+++ b/unittests/Expr/Makefile
@@ -9,4 +9,5 @@ LINK_COMPONENTS := support
 
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
 
+CXXFLAGS += -DLLVM_29_UNITTEST
 LIBS += -lstp
diff --git a/unittests/Makefile b/unittests/Makefile
index 761987d6..175ccdd5 100644
--- a/unittests/Makefile
+++ b/unittests/Makefile
@@ -14,5 +14,9 @@ DIRS = Expr Solver Ref
 
 include $(LEVEL)/Makefile.common
 
+# Remove -fno-rtti as this prevents typeid() being used
+# in gtest
+CXX.Flags := $(filter-out -fno-rtti,$(CXX.Flags))
+
 clean::
 	$(Verb) $(RM) -f *Tests
diff --git a/unittests/Solver/Makefile b/unittests/Solver/Makefile
index 00713691..83427795 100644
--- a/unittests/Solver/Makefile
+++ b/unittests/Solver/Makefile
@@ -10,3 +10,7 @@ LINK_COMPONENTS := support
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
 
 LIBS += -lstp
+
+ifeq ($(STP_NEEDS_BOOST),1)
+	LIBS += $(UPSTREAM_STP_LINK_FLAGS)
+endif