diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2010-07-13 17:19:57 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2010-07-13 17:19:57 +0000 |
| commit | 9112829d76cbb8e0c8ef51bbc2d7d1be48cd7b74 (patch) | |
| tree | 9de1c5f67a98cd0e73c60838396486c984f63ac2 /utils/unittest/UnitTestMain | |
| parent | 1e3dec662ea18131c495db50caccc57f77b7a5fe (diff) | |
| download | FreeBSD-src-9112829d76cbb8e0c8ef51bbc2d7d1be48cd7b74.zip FreeBSD-src-9112829d76cbb8e0c8ef51bbc2d7d1be48cd7b74.tar.gz | |
Update LLVM to r108243.
Diffstat (limited to 'utils/unittest/UnitTestMain')
| -rw-r--r-- | utils/unittest/UnitTestMain/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/utils/unittest/UnitTestMain/Makefile b/utils/unittest/UnitTestMain/Makefile index 5c10049..cec654f 100644 --- a/utils/unittest/UnitTestMain/Makefile +++ b/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 |
