diff options
| author | Andy Schwerin <Andy Schwerin schwerin@10gen.com> | 2012-02-23 17:35:30 -0500 |
|---|---|---|
| committer | Andy Schwerin <Andy Schwerin schwerin@10gen.com> | 2012-02-23 18:12:57 -0500 |
| commit | b8bb84091d1e5b5b586553bf79ec15e5d1fc61f4 (patch) | |
| tree | ac6ecb5fa5268c8e11fb6aef557ed9538d68c3a2 /distsrc | |
| parent | 51e9b45d893ab822f3885c42d7347572b977c1f6 (diff) | |
| download | mongo-b8bb84091d1e5b5b586553bf79ec15e5d1fc61f4.tar.gz | |
SERVER-5057 C++ Client Build Break
Remove support for building a shared client library from the client source
distribution, because it is broken.
Fix the clientBuild "scons" alias, to correctly build and test the C++ driver as part of the
nightly build. There were some type errors, before.
Diffstat (limited to 'distsrc')
| -rwxr-xr-x | distsrc/client/SConstruct | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct index 4979c9244e6..503b71ccbc7 100755 --- a/distsrc/client/SConstruct +++ b/distsrc/client/SConstruct @@ -68,10 +68,7 @@ for x in dirs: allClientFiles += Glob( "mongo/" + x + "*.cpp" ) allClientFiles += Glob( "mongo/util/*.c" ) -libs = [] -libs += env.SharedLibrary( "mongoclient" , allClientFiles ) -sharedClientLibName = str(libs[-1]) -libs += env.Library( "mongoclient" , allClientFiles ) +libs = env.Library( "mongoclient" , allClientFiles ) # install @@ -86,12 +83,11 @@ for x in dirs: env.Alias( "install" , prefix ) - # example setup clientTests = [] clientEnv = env.Clone(); -clientEnv.Prepend( LIBS=["libmongoclient.a", sharedClientLibName]) +clientEnv.Prepend( LIBS=["mongoclient"] ) clientEnv.Prepend( LIBPATH=["."] ) # examples |