diff options
| author | Duncan Sands <baldrick@free.fr> | 2013-05-14 13:29:16 +0000 |
|---|---|---|
| committer | Duncan Sands <baldrick@free.fr> | 2013-05-14 13:29:16 +0000 |
| commit | 8305acb20062ffa37d1579d0063794432c01c26b (patch) | |
| tree | b2b931a21e13bbf8656e8c61eab91fa0299c5c8b | |
| parent | 15cf700b415f6477fa4152904b8e28cfa501d206 (diff) | |
| download | external_llvm-8305acb20062ffa37d1579d0063794432c01c26b.zip external_llvm-8305acb20062ffa37d1579d0063794432c01c26b.tar.gz external_llvm-8305acb20062ffa37d1579d0063794432c01c26b.tar.bz2 | |
Get the unittests compiling when building with cmake and the setting
-DLLVM_ENABLE_THREADS=false.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@181788 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | unittests/Support/ManagedStatic.cpp | 3 | ||||
| -rw-r--r-- | utils/unittest/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/unittests/Support/ManagedStatic.cpp b/unittests/Support/ManagedStatic.cpp index 8ddad38..1497f4e 100644 --- a/unittests/Support/ManagedStatic.cpp +++ b/unittests/Support/ManagedStatic.cpp @@ -19,7 +19,8 @@ using namespace llvm; namespace { -#if defined(HAVE_PTHREAD_H) && !__has_feature(memory_sanitizer) +#if LLVM_ENABLE_THREADS != 0 && defined(HAVE_PTHREAD_H) && \ + !__has_feature(memory_sanitizer) namespace test1 { llvm::ManagedStatic<int> ms; void *helper(void*) { diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt index 70ed35d..8bdfee1 100644 --- a/utils/unittest/CMakeLists.txt +++ b/utils/unittest/CMakeLists.txt @@ -27,6 +27,10 @@ endif() set(LLVM_REQUIRES_RTTI 1) add_definitions( -DGTEST_HAS_RTTI=0 ) +if (NOT LLVM_ENABLE_THREADS) + add_definitions( -DGTEST_HAS_PTHREAD=0 ) +endif() + # Visual Studio 2012 only supports up to 8 template parameters in # std::tr1::tuple by default, but gtest requires 10 if(MSVC AND MSVC_VERSION EQUAL 1700) |