commit cfee58b45a11221732c58582988d6bb47fb4de04
author Evgeniy Stepanov <eugenis@google.com> Mon Dec 19 15:14:21 2011 +0400
committer Evgeniy Stepanov <eugenis@google.com> Mon Dec 19 16:54:12 2011 +0400
tree 8be5eba01067cdb1ee5338e421e8382cf7622695
parent 41d0579e8de9ef4ff178fc4991043c61a19943f7

Fix Clang build. Enable death tests.

Change-Id: I15ef1c0a7412a1d66a92e3ff12c6083f9f6b03cf

include/gtest/internal/gtest-port.h

diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h
index e06ca00..00d09dd 100644
--- a/include/gtest/internal/gtest-port.h
+++ b/include/gtest/internal/gtest-port.h
@@ -400,6 +400,15 @@
 #   define GTEST_HAS_RTTI 0
 #  endif
 
+# elif defined(__clang__)
+
+// Android does not support RTTI
+#if GTEST_OS_LINUX_ANDROID
+#define GTEST_HAS_RTTI 0
+#else
+#define GTEST_HAS_RTTI 1
+#endif //ANDROID
+
 # else
 
 // For all other compilers, we assume RTTI is enabled.
@@ -546,7 +555,7 @@
 // pops up a dialog window that cannot be suppressed programmatically.
 #if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
      (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
-     GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX)
+     GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || GTEST_OS_LINUX_ANDROID)
 # define GTEST_HAS_DEATH_TEST 1
 # include <vector>  // NOLINT
 #endif