summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2015-04-30 16:41:14 -0400
committerAndrew Morrow <acm@mongodb.com>2015-05-06 15:47:22 -0400
commited40c33fd529664d18dbc5e3e8e51cf36334d338 (patch)
tree3e5bf7583208092347e0f5e484b5fe1432b9fa19
parente0ced4fa50ab2f7ffadf1dd5f3b6f3cd1aa12443 (diff)
downloadmongo-ed40c33fd529664d18dbc5e3e8e51cf36334d338.tar.gz
SERVER-9666 Move parallel into its own library
-rw-r--r--src/mongo/SConscript4
-rw-r--r--src/mongo/client/SConscript9
-rw-r--r--src/mongo/s/SConscript1
3 files changed, 12 insertions, 2 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 4039a2b0204..2d33dd80727 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -194,7 +194,6 @@ env.CppUnitTest(
coredbEnv = env.Clone()
coredbEnv.InjectThirdPartyIncludePaths(libraries=['snappy'])
coredbEnv.Library("coredb", [
- "client/parallel.cpp",
"db/audit.cpp",
"db/commands.cpp",
"db/commands/authentication_commands.cpp",
@@ -447,7 +446,8 @@ serveronlyLibdeps = ["s/coreshard",
'db/storage/storage_engine_metadata',
'util/mmap',
'util/elapsed_tracker',
- '$BUILD_DIR/third_party/shim_snappy']
+ '$BUILD_DIR/third_party/shim_snappy',
+ 'client/parallel']
if wiredtiger:
serveronlyLibdeps.append( 'db/storage/wiredtiger/storage_wiredtiger' )
diff --git a/src/mongo/client/SConscript b/src/mongo/client/SConscript
index 19cf6ef3fe4..e98c8f22015 100644
--- a/src/mongo/client/SConscript
+++ b/src/mongo/client/SConscript
@@ -78,3 +78,12 @@ env.CppUnitTest(
],
NO_CRUTCH=True,
)
+
+env.Library(
+ target="parallel",
+ source=[
+ 'parallel.cpp',
+ ],
+ LIBDEPS=[
+ ],
+)
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index 45184da7c22..4cfbf55d696 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -271,6 +271,7 @@ env.Library(
],
LIBDEPS=[
'$BUILD_DIR/mongo/db/auth/authmongos',
+ '$BUILD_DIR/mongo/client/parallel',
'$BUILD_DIR/mongo/db/fts/ftsmongos',
'$BUILD_DIR/mongo/db/query/explain_common',
'$BUILD_DIR/mongo/db/query/lite_parsed_query',