summaryrefslogtreecommitdiffstats
path: root/contrib/llvm/utils/unittest/UnitTestMain/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/llvm/utils/unittest/UnitTestMain/Makefile')
-rw-r--r--contrib/llvm/utils/unittest/UnitTestMain/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/llvm/utils/unittest/UnitTestMain/Makefile b/contrib/llvm/utils/unittest/UnitTestMain/Makefile
index 5c10049..cec654f 100644
--- a/contrib/llvm/utils/unittest/UnitTestMain/Makefile
+++ b/contrib/llvm/utils/unittest/UnitTestMain/Makefile
@@ -20,7 +20,11 @@ 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.
-# When we import googletest >=1.4.0, we can drop this line.
-CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0
+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
include $(LEVEL)/Makefile.common
OpenPOWER on IntegriCloud