diff options
| author | Andy Schwerin <schwerin@10gen.com> | 2012-07-05 14:49:43 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@10gen.com> | 2012-07-05 15:07:37 -0400 |
| commit | 83418bb235520d8e2d2ee5bd2083a58aadc5eca7 (patch) | |
| tree | 3ac045eeb92a924ce4d8ecb38a48f26ab54a3a9d | |
| parent | 83551169374ded2a86838c6b72c8415adb76b1a4 (diff) | |
| download | mongo-83418bb235520d8e2d2ee5bd2083a58aadc5eca7.tar.gz | |
SERVER-6158: Link against an explicit instance of the mongoclient library.
This makes sure we're building and testing against the version of the library
that we expect.
| -rw-r--r-- | SConstruct | 2 | ||||
| -rwxr-xr-x | distsrc/client/SConstruct | 1 | ||||
| -rw-r--r-- | src/SConscript.client | 10 |
3 files changed, 5 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index 2091d3dc9f0..a2231faa2c5 100644 --- a/SConstruct +++ b/SConstruct @@ -1051,8 +1051,6 @@ if not use_system_version_of_library("boost"): clientEnv.Append(LIBS=['boost_thread', 'boost_filesystem', 'boost_system']) clientEnv.Prepend(LIBPATH=['$BUILD_DIR/third_party/boost/']) -clientEnv.Prepend(LIBS=['mongoclient'], LIBPATH=['.']) - # The following symbols are exported for use in subordinate SConscript files. # Ideally, the SConscript files would be purely declarative. They would only # import build environment objects, and would contain few or no conditional diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct index 75726ce560e..d3738147c37 100755 --- a/distsrc/client/SConstruct +++ b/distsrc/client/SConstruct @@ -77,7 +77,6 @@ conf.Finish() clientEnv = env.Clone() clientEnv['CPPDEFINES'].remove('MONGO_EXPOSE_MACROS') -clientEnv.Prepend(LIBS=['mongoclient'], LIBPATH=['.']) Export("env clientEnv") env.SConscript('src/SConscript.client', variant_dir='$BUILD_DIR', duplicate=False) diff --git a/src/SConscript.client b/src/SConscript.client index 519fa2a22e3..abf43a4e04c 100644 --- a/src/SConscript.client +++ b/src/SConscript.client @@ -95,18 +95,18 @@ for path in clientHeaderDirectories: clientHeaders.extend(Glob('mongo/%s/*.h' % path)) clientHeaders.extend(Glob('mongo/%s/*.hpp' % path)) +mongoclient_lib = env.Library('mongoclient', clientSource), env.Install('#/', [ - env.Library('mongoclient', clientSource), + mongoclient_lib, #env.SharedLibrary('mongoclient', clientSource), ]) clientTests = clientEnv.Install('#/', [ - clientEnv.Program(target, [source]) for (target, source) in exampleSourceMap]) + clientEnv.Program(target, + [source, mongoclient_lib]) for (target, source) in exampleSourceMap]) -bsonDemoEnv = clientEnv.Clone() -bsonDemoEnv['LIBS'].remove('mongoclient') clientTests.append( - bsonDemoEnv.Install('#/', bsonDemoEnv.Program('bsondemo', 'mongo/bson/bsondemo/bsondemo.cpp'))) + clientEnv.Install('#/', clientEnv.Program('bsondemo', 'mongo/bson/bsondemo/bsondemo.cpp'))) clientEnv.Alias('clientTests', clientTests, []) |