diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2009-08-12 14:54:53 -0400 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2009-08-12 14:54:53 -0400 |
| commit | 7b9da727ba3e830f243946766215b39162a50e4f (patch) | |
| tree | 8f1fb603c5e77c51ad50b49fad69474c70707799 | |
| parent | e07cbd84344d768f3c7fe2f3228c991581214053 (diff) | |
| download | mongo-7b9da727ba3e830f243946766215b39162a50e4f.tar.gz | |
compile on 10.4 SERVER-231
| -rw-r--r-- | SConstruct | 3 | ||||
| -rw-r--r-- | shell/dbshell.cpp | 1 | ||||
| -rw-r--r-- | util/goodies.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 8e53fa91bab..5866d859a80 100644 --- a/SConstruct +++ b/SConstruct @@ -639,6 +639,9 @@ def doConfigure( myenv , needJava=True , needPcre=True , shell=False ): # this will add it iff it exists and works myCheckLib( "boost_system" + boostCompiler + "-mt" ) + if not conf.CheckCXXHeader( "execinfo.h" ): + myenv.Append( CPPDEFINES=[ "NOEXECINFO" ] ) + if needJava: for j in javaLibs: myCheckLib( j , True , True ) diff --git a/shell/dbshell.cpp b/shell/dbshell.cpp index 32ae7623e8b..98e1e9b4b7a 100644 --- a/shell/dbshell.cpp +++ b/shell/dbshell.cpp @@ -57,7 +57,6 @@ char * shellReadline( const char * prompt ){ } #if !defined(_WIN32) -#include <execinfo.h> #include <string.h> void quitNicely( int sig ){ diff --git a/util/goodies.h b/util/goodies.h index f29f9fe213a..34cb289b460 100644 --- a/util/goodies.h +++ b/util/goodies.h @@ -23,7 +23,7 @@ namespace mongo { -#if !defined(_WIN32) +#if !defined(_WIN32) && !defined(NOEXECINFO) } // namespace mongo @@ -60,7 +60,7 @@ namespace mongo { free (strings); } #else - inline void printStackTrace() { } + inline void printStackTrace( ostream &o = cout ) { } #endif /* set to TRUE if we are exiting */ |