drop DumpBacktrace

It wasn't that helpful; simplifies other platforms to just not use it.

diff --git a/bootstrap.sh b/bootstrap.sh
index 571c98c8b2d1b6d8096368918ea15e8da3d5e750..5c9b950e4582b539a707ac5c3deaedadf05e36fa 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -23,7 +23,7 @@ if [ "${SYSTEMNAME}" = "Linux" ]; then
     EXTRA_LDFLAGS=
 elif [ "${SYSTEMNAME}" = "FreeBSD" ]; then
     EXTRA_CFLAGS="-I/usr/local/include"
-    EXTRA_LDFLAGS="-L/usr/local/lib -lexecinfo"
+    EXTRA_LDFLAGS="-L/usr/local/lib"
 fi
 
 cat >config.ninja <<EOT
@@ -37,11 +37,7 @@ EOT
 
 echo "Building ninja manually..."
 srcs=$(ls src/*.cc | grep -v test)
-if [ "${SYSTEMNAME}" = "Linux" ]; then
-    g++ -Wno-deprecated -o ninja.bootstrap $srcs
-elif [ "${SYSTEMNAME}" = "FreeBSD" ]; then
-    g++ -Wno-deprecated ${EXTRA_CFLAGS} ${EXTRA_LDFLAGS} -o ninja.bootstrap $srcs
-fi
+g++ -Wno-deprecated ${EXTRA_CFLAGS} ${EXTRA_LDFLAGS} -o ninja.bootstrap $srcs
 
 echo "Building ninja using itself..."
 ./ninja.bootstrap ninja

diff --git a/src/util.cc b/src/util.cc
index 2eb4559eae698955f030032a6a8baaf51f2d7bc7..1968702c97d4f752cb206dff5728cf261b034f24 100644 (file)
--- a/src/util.cc
+++ b/src/util.cc
@@ -14,18 +14,10 @@
 
 #include "util.h"
 
-#include <execinfo.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-void DumpBacktrace(int skip_frames) {
-  void* stack[256];
-  int size = backtrace(stack, 256);
-  ++skip_frames;  // Skip ourselves as well.
-  backtrace_symbols_fd(stack + skip_frames, size - skip_frames, 2);
-}
-
 void Fatal(const char* msg, ...) {
   va_list ap;
   fprintf(stderr, "FATAL: ");
@@ -33,6 +25,5 @@ void Fatal(const char* msg, ...) {
   vfprintf(stderr, msg, ap);
   va_end(ap);
   fprintf(stderr, "\n");
-  DumpBacktrace(1);
   exit(1);
 }