From 2e3f44eab2cd1ade5316f0a2eb5e57d87119d89c Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Thu, 3 Jun 2010 15:17:04 +0000 Subject: [PATCH] Disable pthread support in googletest if llvm was configured without threads. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@105390 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Makefile.unittest | 5 +++++ utils/unittest/UnitTestMain/Makefile | 5 +++++ utils/unittest/googletest/Makefile | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest index 6001c436e5a..2a701a019d8 100644 --- a/unittests/Makefile.unittest +++ b/unittests/Makefile.unittest @@ -27,6 +27,11 @@ CPP.Flags += -DGTEST_HAS_RTTI=0 # 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 + TESTLIBS = -lGoogleTest -lUnitTestMain ifeq ($(ENABLE_SHARED), 1) diff --git a/utils/unittest/UnitTestMain/Makefile b/utils/unittest/UnitTestMain/Makefile index 202ccb8eeed..cec654f73af 100644 --- a/utils/unittest/UnitTestMain/Makefile +++ b/utils/unittest/UnitTestMain/Makefile @@ -22,4 +22,9 @@ CPP.Flags += -DGTEST_HAS_RTTI=0 # 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 + include $(LEVEL)/Makefile.common diff --git a/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile index bfd35a4f510..21b29ffc2c3 100644 --- a/utils/unittest/googletest/Makefile +++ b/utils/unittest/googletest/Makefile @@ -25,6 +25,11 @@ CPP.Flags += -DGTEST_HAS_RTTI=0 # 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 + ifeq ($(HOST_OS),MingW) CPP.Flags += -DGTEST_OS_WINDOWS=1 endif -- 2.34.1