aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2014-06-18 12:29:01 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-06-18 12:29:01 -0700
commit4ea2661cbd809629d2ee60d826a058d368bed009 (patch)
tree0fd95ac6a29d8e5b861093069e598ddb04c6e84a
parent30e6e2af14e84216b1c113fd7500d0822bc81daa (diff)
No CrashHandler for NACL bots.
CQ_EXTRA_TRYBOTS=tryserver.skia:Build-Ubuntu13.10-GCC4.8-NaCl-Debug-Trybot BUG=skia: R=mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/344603005
-rw-r--r--tools/CrashHandler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/CrashHandler.cpp b/tools/CrashHandler.cpp
index 193e1af0b2..cd104a6859 100644
--- a/tools/CrashHandler.cpp
+++ b/tools/CrashHandler.cpp
@@ -39,7 +39,7 @@ static void handler(int sig) {
_Exit(sig);
}
-#elif defined(SK_BUILD_FOR_UNIX)
+#elif defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_NACL) // NACL doesn't have backtrace().
// We'd use libunwind here too, but it's a pain to get installed for both 32 and 64 bit on bots.
// Doesn't matter much: catchsegv is best anyway.
@@ -59,7 +59,7 @@ static void handler(int sig) {
#endif
-#if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_MAC)
+#if defined(SK_BUILD_FOR_MAC) || (defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_NACL))
void SetupCrashHandler() {
static const int kSignals[] = {