X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2Funittest%2FUnitTestMain%2FMakefile;h=30827795aff9795c3a5d355186067fed6687721a;hb=adf01b3f18442ae8db6b8948e70d82d9df415119;hp=07a74e3c0db2cdd578e65db12dcad353929f9f26;hpb=f845c74c6243a10ee5df2af003dcf81bbd0b51a0;p=oota-llvm.git

diff --git a/utils/unittest/UnitTestMain/Makefile b/utils/unittest/UnitTestMain/Makefile
index 07a74e3c0db..30827795aff 100644
--- a/utils/unittest/UnitTestMain/Makefile
+++ b/utils/unittest/UnitTestMain/Makefile
@@ -13,7 +13,20 @@ include $(LEVEL)/Makefile.config
 
 LIBRARYNAME = UnitTestMain
 BUILD_ARCHIVE = 1
+REQUIRES_RTTI = 1
+
 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
-CPP.Flags += -Wno-variadic-macros
+CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)
+CPP.Flags += -DGTEST_HAS_RTTI=0
+# libstdc++'s TR1 <tuple> header depends on RTTI and uses C++'0x features not
+# supported by Clang, so force googletest to use its own tuple implementation.
+CPP.Flags += -DGTEST_USE_OWN_TR1_TUPLE
+
+# Disable pthreads if LLVM was configured without them.
+ifneq ($(HAVE_PTHREAD), 1)
+  CPP.Flags += -DGTEST_HAS_PTHREAD=0
+endif
+
+NO_INSTALL = 1
 
 include $(LEVEL)/Makefile.common