diff options
| -rw-r--r-- | SConstruct | 3 | ||||
| -rw-r--r-- | src/mongo/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/util/SConscript | 13 |
3 files changed, 14 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index d6198a5a492..82ab31a102a 100644 --- a/SConstruct +++ b/SConstruct @@ -1148,9 +1148,6 @@ if nix: env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind env.Append( CPPDEFINES=["_DEBUG"] ); - if has_option( "gdbserver" ): - env.Append( CPPDEFINES=["USE_GDBSERVER"] ) - if has_option( "ssl" ): env.Append( CPPDEFINES=["MONGO_SSL"] ) env.Append( MONGO_CRYPTO=["openssl"] ) diff --git a/src/mongo/SConscript b/src/mongo/SConscript index 4711f1d5179..3d8a9dde81b 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -65,7 +65,6 @@ env.Library('foundation', [ 'util/assert_util.cpp', 'util/concurrency/mutex.cpp', 'util/concurrency/thread_pool.cpp', - 'util/debugger.cpp', 'util/exception_filter_win32.cpp', 'util/file.cpp', 'util/log.cpp', @@ -83,6 +82,7 @@ env.Library('foundation', '$BUILD_DIR/mongo/logger/logger', '$BUILD_DIR/mongo/platform/platform', '$BUILD_DIR/mongo/util/concurrency/thread_name', + '$BUILD_DIR/mongo/util/debugger', '$BUILD_DIR/third_party/shim_allocator', '$BUILD_DIR/third_party/shim_boost', '$BUILD_DIR/third_party/shim_tz']) diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript index fd669c47ba0..493d17aa752 100644 --- a/src/mongo/util/SConscript +++ b/src/mongo/util/SConscript @@ -1,4 +1,5 @@ Import("env") +Import("has_option") env.Library( target= 'intrusive_counter', @@ -9,3 +10,15 @@ env.Library( '$BUILD_DIR/mongo/foundation', ] ) + +debuggerEnv = env.Clone() +if has_option("gdbserver"): + debuggerEnv.Append(CPPDEFINES=["USE_GDBSERVER"]) + +debuggerEnv.Library( + target= 'debugger', + source= [ + 'debugger.cpp', + ], + LIBDEPS= [] + ) |