diff options
| author | Mike Dirolf <mike@10gen.com> | 2010-07-28 12:35:57 -0400 |
|---|---|---|
| committer | Mike Dirolf <mike@10gen.com> | 2010-07-28 12:35:57 -0400 |
| commit | 6656bcd61dfdc1daaafb070fa58e81777c15f5ae (patch) | |
| tree | 4ac7b6324c53084bff04961844fe45383706e4bd /distsrc | |
| parent | 8d6a597d6285541266c37e9a4956e7ed9da6870e (diff) | |
| download | mongo-6656bcd61dfdc1daaafb070fa58e81777c15f5ae.tar.gz | |
attempt at using checkLib for client SConstruct
Diffstat (limited to 'distsrc')
| -rw-r--r-- | distsrc/client/SConstruct | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct index 7221a97420f..63782064dfd 100644 --- a/distsrc/client/SConstruct +++ b/distsrc/client/SConstruct @@ -40,7 +40,10 @@ if linux: env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " ) boostLibs = [ "thread" , "filesystem" , "system" ] -env.Prepend( LIBS =["boost_%s-mt"%(lib) for lib in boostLibs ] ) +conf = Configure(env) +for lib in boostLibs: + if not conf.CheckLib("boost_%s-mt" % lib): + conf.CheckLib("boost_%s" % lib) allClientFiles = [] allClientFiles += Glob( "mongo/*.cpp" ) allClientFiles += Glob( "mongo/client/*.cpp" ) @@ -56,12 +59,8 @@ env.SharedLibrary( "mongoclient" , allClientFiles ) clientTests = [] clientEnv = env.Clone(); -#clientEnv.Append( CPPPATH=["../"] ) -clientEnv.Prepend( LIBS=[ "mongoclient"]+["boost_%s-mt"%(lib) for lib in boostLibs ] ) - +clientEnv.Prepend( LIBS=["mongoclient"]) clientEnv.Prepend( LIBPATH=["."] ) -#clientEnv["CPPDEFINES"].remove( "MONGO_EXPOSE_MACROS" ) -l = clientEnv[ "LIBS" ] # examples clientTests += [ clientEnv.Program( "firstExample" , [ "client/examples/first.cpp" ] ) ] |