Merge pull request #1542 from gennadiycivil/master

Tweaking #1523 to exclude nacl, cl 191591810

Merge pull request #1542 from gennadiycivil/master
Tweaking #1523 to exclude nacl, cl 191591810
43776990 · Gennadiy Civil · GitHub · 07af8af3 · 1776ed8c · 43776990
Unverified Commit 43776990 authored Apr 04, 2018 by Gennadiy Civil Committed by GitHub Apr 04, 2018
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

googletest/src/gtest.cc googletest/src/gtest.cc +3 -1

No files found.
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -4549,7 +4549,9 @@ void UnitTest::AddTestPartResult(
      // when a failure happens and both the --gtest_break_on_failure and
      // the --gtest_catch_exceptions flags are specified.
      DebugBreak();
-#elif (defined(__clang__) || defined(__GNUC__)) && (defined(__x86_64__) || defined(__i386__))
+#elif (!defined(__native_client__)) &&            \
+    ((defined(__clang__) || defined(__GNUC__)) && \
+     (defined(__x86_64__) || defined(__i386__)))
      // with clang/gcc we can achieve the same effect on x86 by invoking int3
      asm("int3");
 #else