Permalink
Browse files

Link programs by linking all object files on the command line.

This is done rather than enumerating a list of static libraries to include.

SERVER-5112 and SERVER-6461
  • Loading branch information...
1 parent da468fd commit 78f93d7a3383b3eff72087f7b1a96930ddb59792 @andy10gen andy10gen committed Jul 16, 2012
Showing with 6 additions and 7 deletions.
  1. +2 −0 SConstruct
  2. +4 −7 src/mongo/SConscript
View
@@ -302,6 +302,8 @@ env = Environment( BUILD_DIR=variantDir,
CONFIGURELOG = scons_data_dir + '/config.log'
)
+env['_LIBDEPS'] = '$_LIBDEPS_OBJS'
+
if has_option('mute'):
env.Append( CCCOMSTR = "Compiling $TARGET" )
env.Append( CXXCOMSTR = env["CCCOMSTR"] )
View
@@ -403,8 +403,7 @@ env.StaticLibrary("coreserver", coreServerFiles, LIBDEPS=["mongocommon", "script
mongod = env.Install(
'#/', env.Program( "mongod", mongodOnlyFiles,
LIBDEPS=["coreserver", "serveronly", "coredb", "ntservice",
- "mongodandmongos"] + modules,
- _LIBDEPS='$_LIBDEPS_OBJS' ) )
+ "mongodandmongos"] + modules ) )
Default( mongod )
# tools
@@ -434,24 +433,22 @@ env.Install( '#/', [
mongos = env.Program(
"mongos", [ "s/server.cpp"] ,
LIBDEPS=["mongoscore", "coreserver", "coredb", "mongocommon", "coreshard", "dbcmdline", "ntservice",
- "mongodandmongos"],
- _LIBDEPS='$_LIBDEPS_OBJS')
+ "mongodandmongos"])
env.Install( '#/', mongos )
env.Library("clientandshell", ["client/clientAndShell.cpp"], LIBDEPS=["mongocommon", "defaultversion", "gridfs", "notmongodormongos"])
env.Library("allclient", "client/clientOnly.cpp", LIBDEPS=["clientandshell"])
if has_option( "sharedclient" ):
- sharedClientLibName = str( env.SharedLibrary( "mongoclient", [], LIBDEPS=["allclient"], _LIBDEPS='$_LIBDEPS_OBJS' )[0] )
+ sharedClientLibName = str( env.SharedLibrary( "mongoclient", [], LIBDEPS=["allclient"] )[0] )
# dbtests test binary
env.StaticLibrary('testframework', ['dbtests/framework.cpp'], LIBDEPS=['unittest/unittest'])
test = testEnv.Install(
'#/',
testEnv.Program( "test", [ f for f in Glob( "dbtests/*.cpp" ) if not str( f ).endswith( 'framework.cpp' ) ],
- LIBDEPS=["mongocommon", "serveronly", "coreserver", "coredb", "testframework", "gridfs", "notmongodormongos" ],
- _LIBDEPS='$_LIBDEPS_OBJS' ) )
+ LIBDEPS=["mongocommon", "serveronly", "coreserver", "coredb", "testframework", "gridfs", "notmongodormongos" ] ) )
if len(testEnv.subst('$PROGSUFFIX')):
testEnv.Alias( "test", "#/${PROGPREFIX}test${PROGSUFFIX}" )

0 comments on commit 78f93d7

Please sign in to comment.