diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-09-24 09:01:13 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-09-24 09:01:13 +0000 |
| commit | 10d274d874666b4efaff535d4d48a65fe8d51bbb (patch) | |
| tree | 7893af990330399b2dcd658c959f7efbc32480bd /llvm/utils/unittest/googletest/include/gtest/internal | |
| parent | 1444f47deb30fe8e2ca49222764361a07d716c16 (diff) | |
| download | bcm5719-llvm-10d274d874666b4efaff535d4d48a65fe8d51bbb.tar.gz bcm5719-llvm-10d274d874666b4efaff535d4d48a65fe8d51bbb.zip | |
CMake: Build unittests.
llvm-svn: 114725
Diffstat (limited to 'llvm/utils/unittest/googletest/include/gtest/internal')
| -rw-r--r-- | llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h index 9683271e48f..3d076eb44c7 100644 --- a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h @@ -403,7 +403,8 @@ // defining __GNUC__ and friends, but cannot compile GCC's tuple // implementation. MSVC 2008 (9.0) provides TR1 tuple in a 323 MB // Feature Pack download, which we cannot assume the user has. -#if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \ +#if (defined(__GNUC__) && !(defined(__CUDACC__) || defined(__clang__)) \ + && (GTEST_GCC_VER_ >= 40000)) \ || _MSC_VER >= 1600 #define GTEST_USE_OWN_TR1_TUPLE 0 #else |
