diff --git src/lib/googletest/googletest/include/gtest/internal/gtest-port.h src/lib/googletest/googletest/include/gtest/internal/gtest-port.h
index 0094ed5..41aa33e 100644
--- src/lib/googletest/googletest/include/gtest/internal/gtest-port.h
+++ src/lib/googletest/googletest/include/gtest/internal/gtest-port.h
@@ -786,6 +786,7 @@ using ::std::tuple_size;
 // Google Test does not support death tests for VC 7.1 and earlier as
 // abort() in a VC 7.1 application compiled as GUI in debug config
 // pops up a dialog window that cannot be suppressed programmatically.
+#ifndef GTEST_HAS_DEATH_TEST
 #if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
      (GTEST_OS_MAC && !GTEST_OS_IOS) || \
      (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
@@ -793,6 +794,7 @@ using ::std::tuple_size;
      GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD)
 # define GTEST_HAS_DEATH_TEST 1
 #endif
+#endif
 
 // We don't support MSVC 7.1 with exceptions disabled now.  Therefore
 // all the compilers we care about are adequate for supporting
@@ -963,7 +963,7 @@
 
 // _LIBCPP_VERSION is defined by the libc++ library from the LLVM project.
 #if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)
-# define GTEST_HAS_CXXABI_H_ 1
+# define GTEST_HAS_CXXABI_H_ 0
 #else
 # define GTEST_HAS_CXXABI_H_ 0
 #endif
