From 1776ed8c1e9db8cfef66f79229a039023a7ceca0 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Wed, 4 Apr 2018 11:06:09 -0400 Subject: Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl --- googletest/src/gtest.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 725aa089..73e9bf86 100644 --- 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 -- cgit v1.2.3