Revert "SERVER-5852 use libunwind routines for backtrace on freebsd"

This reverts commit e6f9efc3c372f5bc8871df838c6e891117655a88.

This may be resubmitted as a generic replacement for backtrace()
on all platforms, rather than just FreeBSD.

1 files changed, 3 insertions, 8 deletions

diff --git a/SConstruct b/SConstruct
index 4c8f52889b7..b349f4e4166 100644
--- a/SConstruct
+++ b/SConstruct
@@ -789,10 +789,7 @@ def doConfigure(myenv):
     if solaris or conf.CheckDeclaration('clock_gettime', includes='#include <time.h>'):
         conf.CheckLib('rt')
 
-    if freebsd and conf.CheckCXXHeader( "unwind.h" ):
-        myenv.Append( CPPDEFINES=[ "MONGO_HAVE_UNWIND_BACKTRACE" ] )
-
-    elif (conf.CheckCXXHeader( "execinfo.h" ) and
+    if (conf.CheckCXXHeader( "execinfo.h" ) and
         conf.CheckDeclaration('backtrace', includes='#include <execinfo.h>') and
         conf.CheckDeclaration('backtrace_symbols', includes='#include <execinfo.h>')):
 
@@ -811,11 +808,9 @@ def doConfigure(myenv):
         if not conf.CheckLib( v8_lib_choices ):
             Exit(1)
 
-    # requires ports devel/libexecinfo or devel/libunwind to be installed
+    # requires ports devel/libexecinfo to be installed
     if freebsd or openbsd:
-        # CheckLib actually sets the -l argument, so check in the
-        # order of precedence.
-        if not (conf.CheckLib("unwind") or conf.CheckLib("execinfo")):
+        if not conf.CheckLib("execinfo"):
             Exit(1)
 
     # 'tcmalloc' needs to be the last library linked. Please, add new libraries before this