SERVER-11658 Consistently use Library target

27 files changed, 440 insertions, 440 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 3e12d3ad96b..d0d4ea4864f 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -39,35 +39,35 @@ def add_exe( v ):
 
 # ------    SOURCE FILE SETUP -----------
 
-env.StaticLibrary('foundation',
-                  [ 'util/assert_util.cpp',
-                    'util/concurrency/mutexdebugger.cpp',
-                    'util/debug_util.cpp',
-                    'util/exception_filter_win32.cpp',
-                    'util/file.cpp',
-                    'util/log.cpp',
-                    'util/platform_init.cpp',
-                    'util/signal_handlers.cpp',
-                    'util/text.cpp',
-                    'util/time_support.cpp',
-                    'util/timer.cpp',
-                    "util/util.cpp",
-                    "util/startup_test.cpp",
-                    ],
-                  LIBDEPS=['stacktrace',
-                           '$BUILD_DIR/mongo/base/base',
-                           '$BUILD_DIR/mongo/logger/logger',
-                           '$BUILD_DIR/mongo/platform/platform',
-                           '$BUILD_DIR/mongo/util/concurrency/thread_name',
-                           '$BUILD_DIR/third_party/shim_allocator',
-                           '$BUILD_DIR/third_party/shim_boost'])
+env.Library('foundation',
+            [ 'util/assert_util.cpp',
+              'util/concurrency/mutexdebugger.cpp',
+              'util/debug_util.cpp',
+              'util/exception_filter_win32.cpp',
+              'util/file.cpp',
+              'util/log.cpp',
+              'util/platform_init.cpp',
+              'util/signal_handlers.cpp',
+              'util/text.cpp',
+              'util/time_support.cpp',
+              'util/timer.cpp',
+              "util/util.cpp",
+              "util/startup_test.cpp",
+              ],
+            LIBDEPS=['stacktrace',
+                     '$BUILD_DIR/mongo/base/base',
+                     '$BUILD_DIR/mongo/logger/logger',
+                     '$BUILD_DIR/mongo/platform/platform',
+                     '$BUILD_DIR/mongo/util/concurrency/thread_name',
+                     '$BUILD_DIR/third_party/shim_allocator',
+                     '$BUILD_DIR/third_party/shim_boost'])
 
 env.CppUnitTest('text_test', 'util/text_test.cpp', LIBDEPS=['foundation'])
 env.CppUnitTest('util/time_support_test', 'util/time_support_test.cpp', LIBDEPS=['foundation'])
 
-env.StaticLibrary('stringutils', ['util/stringutils.cpp', 'util/base64.cpp', 'util/hex.cpp'])
+env.Library('stringutils', ['util/stringutils.cpp', 'util/base64.cpp', 'util/hex.cpp'])
 
-env.StaticLibrary('md5', [
+env.Library('md5', [
         'util/md5.cpp'
         ])
 
@@ -77,7 +77,7 @@ env.CppUnitTest( "md5_test", ["util/md5_test.cpp", "util/md5main.cpp" ],
 env.CppUnitTest( "stringutils_test", [ "util/stringutils_test.cpp" ],
                  LIBDEPS=["stringutils"] )
 
-env.StaticLibrary('bson', [
+env.Library('bson', [
         'bson/mutable/document.cpp',
         'bson/mutable/element.cpp',
         'bson/util/bson_extract.cpp',
@@ -94,7 +94,7 @@ env.StaticLibrary('bson', [
         '$BUILD_DIR/mongo/platform/platform',
         ])
 
-env.StaticLibrary('mutable_bson_test_utils', [
+env.Library('mutable_bson_test_utils', [
         'bson/mutable/mutable_bson_test_utils.cpp'
         ], LIBDEPS=['bson'])
 
@@ -135,44 +135,44 @@ env.CppUnitTest('namespace_test', ['db/catalog/ondisk/namespace_test.cpp'],
 env.CppUnitTest('index_set_test', ['db/index_set_test.cpp'],
                 LIBDEPS=['bson','index_set'])
 
-env.StaticLibrary('path',
-                  ['db/matcher/path.cpp',
-                   'db/matcher/path_internal.cpp'],
-                  LIBDEPS=['bson',
-                           '$BUILD_DIR/mongo/db/common'])
+env.Library('path',
+            ['db/matcher/path.cpp',
+             'db/matcher/path_internal.cpp'],
+            LIBDEPS=['bson',
+                     '$BUILD_DIR/mongo/db/common'])
 
 env.CppUnitTest('path_test', ['db/matcher/path_test.cpp'],
                 LIBDEPS=['path'])
 
 
-env.StaticLibrary('expressions',
-                  ['db/matcher/expression.cpp',
-                   'db/matcher/expression_array.cpp',
-                   'db/matcher/expression_leaf.cpp',
-                   'db/matcher/expression_tree.cpp',
-                   'db/matcher/expression_parser.cpp',
-                   'db/matcher/expression_parser_tree.cpp',
-                   'db/matcher/matchable.cpp',
-                   'db/matcher/match_details.cpp'],
-                  LIBDEPS=['bson',
-                           'path',
-                           '$BUILD_DIR/mongo/db/common',
-                           '$BUILD_DIR/third_party/shim_pcrecpp'
-                           ] )
-
-env.StaticLibrary('expressions_geo',
-                  ['db/matcher/expression_geo.cpp',
-                   'db/matcher/expression_parser_geo.cpp'],
-                  LIBDEPS=['expressions','geoquery','geoparser'] )
-
-env.StaticLibrary('expressions_text',
-                  ['db/matcher/expression_text.cpp',
-                   'db/matcher/expression_parser_text.cpp'],
-                  LIBDEPS=['expressions','db/fts/base'] )
-
-env.StaticLibrary('expressions_where',
-                  ['db/matcher/expression_where.cpp'],
-                  LIBDEPS=['expressions'] )
+env.Library('expressions',
+            ['db/matcher/expression.cpp',
+             'db/matcher/expression_array.cpp',
+             'db/matcher/expression_leaf.cpp',
+             'db/matcher/expression_tree.cpp',
+             'db/matcher/expression_parser.cpp',
+             'db/matcher/expression_parser_tree.cpp',
+             'db/matcher/matchable.cpp',
+             'db/matcher/match_details.cpp'],
+            LIBDEPS=['bson',
+                     'path',
+                     '$BUILD_DIR/mongo/db/common',
+                     '$BUILD_DIR/third_party/shim_pcrecpp'
+                     ] )
+
+env.Library('expressions_geo',
+            ['db/matcher/expression_geo.cpp',
+             'db/matcher/expression_parser_geo.cpp'],
+            LIBDEPS=['expressions','geoquery','geoparser'] )
+
+env.Library('expressions_text',
+            ['db/matcher/expression_text.cpp',
+             'db/matcher/expression_parser_text.cpp'],
+            LIBDEPS=['expressions','db/fts/base'] )
+
+env.Library('expressions_where',
+            ['db/matcher/expression_where.cpp'],
+            LIBDEPS=['expressions'] )
 
 env.CppUnitTest('expression_test',
                 ['db/matcher/expression_test.cpp',
@@ -214,51 +214,51 @@ env.CppUnitTest('curop_test',
                 LIBDEPS=['serveronly', 'coredb', 'coreserver'],
                 NO_CRUTCH=True)
 
-env.StaticLibrary( 'mongohasher', [ "db/hasher.cpp" ] )
+env.Library( 'mongohasher', [ "db/hasher.cpp" ] )
 
-env.StaticLibrary('synchronization', [ 'util/concurrency/synchronization.cpp' ])
+env.Library('synchronization', [ 'util/concurrency/synchronization.cpp' ])
 
-env.StaticLibrary('auth_helpers', ['client/auth_helpers.cpp'], LIBDEPS=['md5'])
+env.Library('auth_helpers', ['client/auth_helpers.cpp'], LIBDEPS=['md5'])
 
-env.StaticLibrary('spin_lock', ["util/concurrency/spin_lock.cpp"])
+env.Library('spin_lock', ["util/concurrency/spin_lock.cpp"])
 env.CppUnitTest('spin_lock_test', ['util/concurrency/spin_lock_test.cpp'],
                 LIBDEPS=['spin_lock', '$BUILD_DIR/third_party/shim_boost'])
 
-env.StaticLibrary('network', [
-                  "util/net/sock.cpp",
-                  "util/net/socket_poll.cpp",
-                  "util/net/ssl_manager.cpp",
-                  "util/net/ssl_options.cpp",
-                  "util/net/httpclient.cpp",
-                  "util/net/message.cpp",
-                  "util/net/message_port.cpp",
-                  "util/net/listen.cpp" ],
-                  LIBDEPS=['$BUILD_DIR/mongo/util/options_parser/options_parser',
-                           'background_job',
-                           'fail_point',
-                           'foundation',
-                           'server_options_core',
-                  ])
-
-env.StaticLibrary('clientdriver', [
-                  "client/connpool.cpp",
-                  "client/dbclient.cpp",
-                  "client/dbclient_rs.cpp",
-                  "client/dbclientcursor.cpp",
-                  'client/sasl_client_authenticate.cpp',
-                  "client/syncclusterconnection.cpp",
-                  "db/dbmessage.cpp"
-                  ],
-                  LIBDEPS=['auth_helpers',
-                           'network',
-                  ])
-
-env.StaticLibrary('lasterror', [
-                  "db/lasterror.cpp",
-                  ],
-                  LIBDEPS=['network',
-                           'foundation',
-                  ])
+env.Library('network', [
+            "util/net/sock.cpp",
+            "util/net/socket_poll.cpp",
+            "util/net/ssl_manager.cpp",
+            "util/net/ssl_options.cpp",
+            "util/net/httpclient.cpp",
+            "util/net/message.cpp",
+            "util/net/message_port.cpp",
+            "util/net/listen.cpp" ],
+            LIBDEPS=['$BUILD_DIR/mongo/util/options_parser/options_parser',
+                     'background_job',
+                     'fail_point',
+                     'foundation',
+                     'server_options_core',
+            ])
+
+env.Library('clientdriver', [
+            "client/connpool.cpp",
+            "client/dbclient.cpp",
+            "client/dbclient_rs.cpp",
+            "client/dbclientcursor.cpp",
+            'client/sasl_client_authenticate.cpp',
+            "client/syncclusterconnection.cpp",
+            "db/dbmessage.cpp"
+            ],
+            LIBDEPS=['auth_helpers',
+                     'network',
+            ])
+
+env.Library('lasterror', [
+            "db/lasterror.cpp",
+            ],
+            LIBDEPS=['network',
+                     'foundation',
+            ])
 
 commonFiles = [ "pch.cpp",
                 "buildinfo.cpp",
@@ -286,11 +286,11 @@ if env['MONGO_BUILD_SASL_CLIENT']:
     if env['PYSYSPLATFORM'] == "win32":
         saslLibs.extend(["secur32"])
 
-    env.StaticLibrary('sasl_client_session',
-                      ['client/sasl_client_session.cpp',
-                       'client/sasl_sspi.cpp'],
-                      LIBDEPS=['foundation'],
-                      SYSLIBDEPS=saslLibs)
+    env.Library('sasl_client_session',
+                ['client/sasl_client_session.cpp',
+                 'client/sasl_sspi.cpp'],
+                LIBDEPS=['foundation'],
+                SYSLIBDEPS=saslLibs)
     commonFiles.extend(['client/sasl_client_authenticate_impl.cpp'])
     extraCommonLibdeps.append('sasl_client_session')
 
@@ -305,55 +305,55 @@ if not os.path.exists( str( processInfoPlatformFile ) ):
 
 processInfoFiles.append( processInfoPlatformFile )
 
-env.StaticLibrary("processinfo",
-                  processInfoFiles,
-                  LIBDEPS=["foundation", "bson"])
+env.Library("processinfo",
+            processInfoFiles,
+            LIBDEPS=["foundation", "bson"])
 
 env.CppUnitTest("processinfo_test",
                 ["util/processinfo_test.cpp"],
                 LIBDEPS=["processinfo"])
 
-env.StaticLibrary("server_parameters",
-                  ["db/server_parameters.cpp"],
-                  LIBDEPS=["foundation","bson"])
+env.Library("server_parameters",
+            ["db/server_parameters.cpp"],
+            LIBDEPS=["foundation","bson"])
 
 env.CppUnitTest("server_parameters_test",
                 [ "db/server_parameters_test.cpp" ],
                 LIBDEPS=["server_parameters"] )
 
 
-env.StaticLibrary("fail_point",
-                  ["util/fail_point.cpp",
-                   "util/fail_point_registry.cpp",
-                   "util/fail_point_service.cpp"],
-                  LIBDEPS=["foundation", "bson"])
+env.Library("fail_point",
+            ["util/fail_point.cpp",
+             "util/fail_point_registry.cpp",
+             "util/fail_point_service.cpp"],
+            LIBDEPS=["foundation", "bson"])
+
+env.Library('mongocommon', commonFiles,
+            LIBDEPS=['auth_helpers',
+                     'bson',
+                     'background_job',
+                     'clientdriver',
+                     'fail_point',
+                     'foundation',
+                     'lasterror',
+                     'md5',
+                     'mongohasher',
+                     'network',
+                     'processinfo',
+                     'spin_lock',
+                     'stacktrace',
+                     'stringutils',
+                     'synchronization',
+                     'util/concurrency/thread_name',
+                     '$BUILD_DIR/third_party/shim_pcrecpp',
+                     '$BUILD_DIR/third_party/murmurhash3/murmurhash3',
+                     '$BUILD_DIR/third_party/shim_boost',
+                     '$BUILD_DIR/mongo/util/options_parser/options_parser',
+                     ] +
+                     extraCommonLibdeps)
 
-env.StaticLibrary('mongocommon', commonFiles,
-                  LIBDEPS=['auth_helpers',
-                           'bson',
-                           'background_job',
-                           'clientdriver',
-                           'fail_point',
-                           'foundation',
-                           'lasterror',
-                           'md5',
-                           'mongohasher',
-                           'network',
-                           'processinfo',
-                           'spin_lock',
-                           'stacktrace',
-                           'stringutils',
-                           'synchronization',
-                           'util/concurrency/thread_name',
-                           '$BUILD_DIR/third_party/shim_pcrecpp',
-                           '$BUILD_DIR/third_party/murmurhash3/murmurhash3',
-                           '$BUILD_DIR/third_party/shim_boost',
-                           '$BUILD_DIR/mongo/util/options_parser/options_parser',
-                           ] +
-                           extraCommonLibdeps)
-
-env.StaticLibrary('background_job', ["util/background.cpp"],
-                  LIBDEPS=['spin_lock'])
+env.Library('background_job', ["util/background.cpp"],
+            LIBDEPS=['spin_lock'])
 
 env.CppUnitTest(
     target="background_job_test",
@@ -371,7 +371,7 @@ tcmallocServerStatus = []
 if get_option('allocator') == 'tcmalloc':
     tcmallocServerStatus.append("util/tcmalloc_server_status_section.cpp")
 
-env.StaticLibrary("coredb", [
+env.Library("coredb", [
         "client/parallel.cpp",
         "db/audit.cpp",
         "db/commands.cpp",
@@ -453,9 +453,9 @@ coreServerFiles = [ "db/client_basic.cpp",
                     "db/log_process_details.cpp",
                     ]
 
-env.StaticLibrary('ntservice', ['util/ntservice.cpp'],
-                  LIBDEPS=['foundation',
-                           '$BUILD_DIR/mongo/util/options_parser/options_parser'])
+env.Library('ntservice', ['util/ntservice.cpp'],
+            LIBDEPS=['foundation',
+                     '$BUILD_DIR/mongo/util/options_parser/options_parser'])
 if windows:
     env.CppUnitTest('ntservice_test', 'util/ntservice_test.cpp',
                     LIBDEPS=['ntservice'],
@@ -466,20 +466,20 @@ scripting_common_files = [ "scripting/engine.cpp",
                            "scripting/bench.cpp",
                            ]
 
-env.StaticLibrary('bson_template_evaluator', ["scripting/bson_template_evaluator.cpp"],
-                  LIBDEPS=['bson'])
+env.Library('bson_template_evaluator', ["scripting/bson_template_evaluator.cpp"],
+            LIBDEPS=['bson'])
 env.CppUnitTest('bson_template_evaluator_test', ['scripting/bson_template_evaluator_test.cpp'],
                 LIBDEPS=['bson_template_evaluator'])
 
 if usev8:
-    env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_v8.cpp',
-                                                             'scripting/v8_db.cpp',
-                                                             'scripting/v8_utils.cpp',
-                                                             'scripting/v8_profiler.cpp'],
-                       LIBDEPS=['bson_template_evaluator', '$BUILD_DIR/third_party/shim_v8'])
+    env.Library('scripting', scripting_common_files + ['scripting/engine_v8.cpp',
+                                                       'scripting/v8_db.cpp',
+                                                       'scripting/v8_utils.cpp',
+                                                       'scripting/v8_profiler.cpp'],
+                 LIBDEPS=['bson_template_evaluator', '$BUILD_DIR/third_party/shim_v8'])
 else:
-    env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_none.cpp'],
-                      LIBDEPS=['bson_template_evaluator'])
+    env.Library('scripting', scripting_common_files + ['scripting/engine_none.cpp'],
+                LIBDEPS=['bson_template_evaluator'])
 
 mmapFiles = [ "util/mmap.cpp" ]
 
@@ -491,7 +491,7 @@ else:
 if has_option( "asio" ):
     coreServerFiles += [ "util/net/message_server_asio.cpp" ]
 
-env.StaticLibrary('index_set', [ 'db/index_set.cpp' ] )
+env.Library('index_set', [ 'db/index_set.cpp' ] )
 
 # mongod files - also files used in tools. present in dbtests, but not in mongos and not in client
 # libs.
@@ -778,33 +778,33 @@ serverOnlyFiles += [ "s/d_logic.cpp",
                      "s/d_merge.cpp",
                      "client/distlock_test.cpp" ]
 
-env.StaticLibrary("defaultversion", "s/default_version.cpp")
+env.Library("defaultversion", "s/default_version.cpp")
 
 # Geo
-env.StaticLibrary("geometry", [ "db/geo/hash.cpp", "db/geo/shapes.cpp", ], LIBDEPS = [ "bson" ])
-env.StaticLibrary("geoparser", [ "db/geo/geoparser.cpp", ],
-                  LIBDEPS = [ "bson",
-                              "geometry",
-                              '$BUILD_DIR/third_party/s2/s2' ])
-env.StaticLibrary("geoquery", [ "db/geo/geoquery.cpp", ],
-                  LIBDEPS = [ "bson",
-                              "geometry",
-                              '$BUILD_DIR/third_party/s2/s2' ])
+env.Library("geometry", [ "db/geo/hash.cpp", "db/geo/shapes.cpp", ], LIBDEPS = [ "bson" ])
+env.Library("geoparser", [ "db/geo/geoparser.cpp", ],
+            LIBDEPS = [ "bson",
+                        "geometry",
+                        '$BUILD_DIR/third_party/s2/s2' ])
+env.Library("geoquery", [ "db/geo/geoquery.cpp", ],
+            LIBDEPS = [ "bson",
+                        "geometry",
+                        '$BUILD_DIR/third_party/s2/s2' ])
 
 env.CppUnitTest("hash_test", [ "db/geo/hash_test.cpp" ], LIBDEPS = ["geometry" ])
 env.CppUnitTest("geoparser_test", [ "db/geo/geoparser_test.cpp" ], LIBDEPS = ["geoparser"])
 
-env.StaticLibrary('range_deleter',
-                  [ 'db/range_deleter.cpp',
-                    'db/range_deleter_mock_env.cpp',
-                    'db/range_deleter_stats.cpp'
-                  ],
-                  LIBDEPS = [
-                      '$BUILD_DIR/mongo/s/base', # range_arithmetic.cpp
-                      'base/base',
-                      'bson',
-                      'synchronization'
-                  ])
+env.Library('range_deleter',
+            [ 'db/range_deleter.cpp',
+              'db/range_deleter_mock_env.cpp',
+              'db/range_deleter_stats.cpp'
+            ],
+            LIBDEPS = [
+                '$BUILD_DIR/mongo/s/base', # range_arithmetic.cpp
+                'base/base',
+                'bson',
+                'synchronization'
+            ])
 
 env.CppUnitTest('range_deleter_test',
                 [ 'db/range_deleter_test.cpp' ],
@@ -814,26 +814,26 @@ env.CppUnitTest('range_deleter_stat_test',
                 [ 'db/range_deleter_stat_test.cpp' ],
                 LIBDEPS = [ 'range_deleter', 'db/common' ]);
 
-env.StaticLibrary("serveronly", serverOnlyFiles,
-                  LIBDEPS=["coreshard",
-                           "db/auth/authmongod",
-                           "db/fts/ftsmongod",
-                           "db/common",
-                           "db/ops/update_driver",
-                           "defaultversion",
-                           "geoparser",
-                           "geoquery",
-                           "index_set",
-                           'range_deleter',
-                           's/metadata',
-                           's/batch_write_types',
-                           "db/exec/working_set",
-                           "db/exec/exec",
-                           "db/query/query",
-                           '$BUILD_DIR/third_party/shim_snappy'])
-
-
-env.StaticLibrary("message_server_port", "util/net/message_server_port.cpp")
+env.Library("serveronly", serverOnlyFiles,
+            LIBDEPS=["coreshard",
+                     "db/auth/authmongod",
+                     "db/fts/ftsmongod",
+                     "db/common",
+                     "db/ops/update_driver",
+                     "defaultversion",
+                     "geoparser",
+                     "geoquery",
+                     "index_set",
+                     'range_deleter',
+                     's/metadata',
+                     's/batch_write_types',
+                     "db/exec/working_set",
+                     "db/exec/exec",
+                     "db/query/query",
+                     '$BUILD_DIR/third_party/shim_snappy'])
+
+
+env.Library("message_server_port", "util/net/message_server_port.cpp")
 
 # These files go into mongos and mongod only, not into the shell or any tools.
 mongodAndMongosFiles = [
@@ -841,29 +841,29 @@ mongodAndMongosFiles = [
     "db/server_extra_log_context.cpp",
     "db/dbwebserver.cpp",
     ]
-env.StaticLibrary("mongodandmongos", mongodAndMongosFiles,
-                  LIBDEPS=["message_server_port"])
-
-env.StaticLibrary("mongodwebserver",
-                  [
-                   "db/clientlistplugin.cpp",
-                   "db/repl/replset_web_handler.cpp",
-                   "db/restapi.cpp",
-                   "db/stats/snapshots_webplugins.cpp",
-                   ],
-                  LIBDEPS=["coredb", "mongodandmongos"])
+env.Library("mongodandmongos", mongodAndMongosFiles,
+            LIBDEPS=["message_server_port"])
+
+env.Library("mongodwebserver",
+            [
+             "db/clientlistplugin.cpp",
+             "db/repl/replset_web_handler.cpp",
+             "db/restapi.cpp",
+             "db/stats/snapshots_webplugins.cpp",
+             ],
+            LIBDEPS=["coredb", "mongodandmongos"])
 
 mongodOnlyFiles = [ "db/db.cpp", "db/commands/touch.cpp", "db/mongod_options_init.cpp" ]
 
 # ----- TARGETS ------
 
-env.StaticLibrary("gridfs", "client/gridfs.cpp")
+env.Library("gridfs", "client/gridfs.cpp")
 
 if has_option( 'use-cpu-profiler' ):
     coreServerFiles.append( 'db/commands/cpuprofile.cpp' )
     env.Append(LIBS=['unwind'])
 
-env.StaticLibrary("coreserver", coreServerFiles, LIBDEPS=["mongocommon", "scripting"])
+env.Library("coreserver", coreServerFiles, LIBDEPS=["mongocommon", "scripting"])
 
 # mongod options
 env.Library("mongod_options", ["db/mongod_options.cpp"],
@@ -894,20 +894,20 @@ Default( mongod )
 allToolFiles = ["tools/tool.cpp",
                 "tools/stat_util.cpp",
                 "tools/tool_logger.cpp"]
-env.StaticLibrary("tool_options", "tools/tool_options.cpp",
-                  LIBDEPS=["server_options",
-                           "$BUILD_DIR/mongo/util/options_parser/options_parser",
-                           "serveronly",
-                           "coreserver",
-                           "coredb",
-                           ])
-env.StaticLibrary("alltools",
-                  allToolFiles,
-                  LIBDEPS=["serveronly",
-                           "coreserver",
-                           "coredb",
-                           "$BUILD_DIR/mongo/util/options_parser/options_parser",
-                           "$BUILD_DIR/mongo/db/auth/authmocks"])
+env.Library("tool_options", "tools/tool_options.cpp",
+            LIBDEPS=["server_options",
+                     "$BUILD_DIR/mongo/util/options_parser/options_parser",
+                     "serveronly",
+                     "coreserver",
+                     "coredb",
+                     ])
+env.Library("alltools",
+            allToolFiles,
+            LIBDEPS=["serveronly",
+                     "coreserver",
+                     "coredb",
+                     "$BUILD_DIR/mongo/util/options_parser/options_parser",
+                     "$BUILD_DIR/mongo/db/auth/authmocks"])
 
 normalTools = [ "dump", "restore", "export", "import", "stat", "top", "oplog" ]
 env.Alias( "tools", [ "#/${PROGPREFIX}mongo" + name + "${PROGSUFFIX}" for name in normalTools ] )
@@ -987,13 +987,13 @@ env.CppUnitTest('framework_options_test', 'dbtests/framework_options_test.cpp',
                 NO_CRUTCH=True)
 
 # dbtests test binary
-env.StaticLibrary('testframework', ['dbtests/framework.cpp', 'dbtests/framework_options_init.cpp'],
-                  LIBDEPS=['unittest/unittest',
-                  '$BUILD_DIR/mongo/util/options_parser/options_parser',
-                  'framework_options',
-                  ])
+env.Library('testframework', ['dbtests/framework.cpp', 'dbtests/framework_options_init.cpp'],
+            LIBDEPS=['unittest/unittest',
+            '$BUILD_DIR/mongo/util/options_parser/options_parser',
+            'framework_options',
+            ])
 
-env.StaticLibrary('mocklib', [
+env.Library('mocklib', [
         'dbtests/mock/mock_conn_registry.cpp',
         'dbtests/mock/mock_dbclient_connection.cpp',
         'dbtests/mock/mock_dbclient_cursor.cpp',
diff --git a/src/mongo/base/SConscript b/src/mongo/base/SConscript
index 6bb79965955..f6c7a18b329 100644
--- a/src/mongo/base/SConscript
+++ b/src/mongo/base/SConscript
@@ -5,21 +5,21 @@ Import("env")
 env.Command(['error_codes.h', 'error_codes.cpp'], ['generate_error_codes.py', 'error_codes.err'],
             '$PYTHON $SOURCES $TARGETS')
 
-env.StaticLibrary('base', ['error_codes.cpp',
-                           'global_initializer.cpp',
-                           'global_initializer_registerer.cpp',
-                           'init.cpp',
-                           'initializer.cpp',
-                           'initializer_context.cpp',
-                           'initializer_dependency_graph.cpp',
-                           'make_string_vector.cpp',
-                           'parse_number.cpp',
-                           'status.cpp',
-                           'string_data.cpp',
-                           ],
-                           LIBDEPS=[
-                           '$BUILD_DIR/third_party/murmurhash3/murmurhash3',
-                           ])
+env.Library('base', ['error_codes.cpp',
+                     'global_initializer.cpp',
+                     'global_initializer_registerer.cpp',
+                     'init.cpp',
+                     'initializer.cpp',
+                     'initializer_context.cpp',
+                     'initializer_dependency_graph.cpp',
+                     'make_string_vector.cpp',
+                     'parse_number.cpp',
+                     'status.cpp',
+                     'string_data.cpp',
+                     ],
+                     LIBDEPS=[
+                     '$BUILD_DIR/third_party/murmurhash3/murmurhash3',
+                     ])
 
 env.CppUnitTest('initializer_dependency_graph_test',
                 ['initializer_dependency_graph_test.cpp'],
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 67c6a388844..a2c62e4c22d 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -8,7 +8,7 @@ Import("env")
 # get resolved.
 #
 
-env.StaticLibrary(
+env.Library(
     target= 'common',
     source= [
         'field_ref.cpp',
diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript
index 46055ad149f..21de24c2571 100644
--- a/src/mongo/db/auth/SConscript
+++ b/src/mongo/db/auth/SConscript
@@ -2,62 +2,62 @@
 
 Import("env")
 
-env.StaticLibrary('serverauth', ['mongo_authentication_session.cpp'])
+env.Library('serverauth', ['mongo_authentication_session.cpp'])
 
 env.Command(['action_type.h', 'action_type.cpp'], ['generate_action_types.py', 'action_types.txt'],
             '$PYTHON $SOURCES $TARGETS')
 
 # Just the data structures used
-env.StaticLibrary('authcore', ['action_set.cpp',
-                               'action_type.cpp',
-                               'authorization_manager.cpp',
-                               'authorization_session.cpp',
-                               'authz_documents_update_guard.cpp',
-                               'authz_manager_external_state.cpp',
-                               'authz_manager_external_state_local.cpp',
-                               'authz_session_external_state.cpp',
-                               'privilege.cpp',
-                               'privilege_parser.cpp',
-                               'resource_pattern.cpp',
-                               'role_graph.cpp',
-                               'role_graph_update.cpp',
-                               'role_name.cpp',
-                               'role_graph_builtin_roles.cpp',
-                               'user.cpp',
-                               'user_document_parser.cpp',
-                               'user_management_commands_parser.cpp',
-                               'user_name.cpp',
-                               'user_set.cpp'],
-                  LIBDEPS=['$BUILD_DIR/mongo/auth_helpers',
-                           '$BUILD_DIR/mongo/base/base',
-                           '$BUILD_DIR/mongo/bson',
-                           '$BUILD_DIR/mongo/db/common',
-                           '$BUILD_DIR/mongo/db/ops/update_driver',
-                           '$BUILD_DIR/mongo/stringutils'])
+env.Library('authcore', ['action_set.cpp',
+                         'action_type.cpp',
+                         'authorization_manager.cpp',
+                         'authorization_session.cpp',
+                         'authz_documents_update_guard.cpp',
+                         'authz_manager_external_state.cpp',
+                         'authz_manager_external_state_local.cpp',
+                         'authz_session_external_state.cpp',
+                         'privilege.cpp',
+                         'privilege_parser.cpp',
+                         'resource_pattern.cpp',
+                         'role_graph.cpp',
+                         'role_graph_update.cpp',
+                         'role_name.cpp',
+                         'role_graph_builtin_roles.cpp',
+                         'user.cpp',
+                         'user_document_parser.cpp',
+                         'user_management_commands_parser.cpp',
+                         'user_name.cpp',
+                         'user_set.cpp'],
+            LIBDEPS=['$BUILD_DIR/mongo/auth_helpers',
+                     '$BUILD_DIR/mongo/base/base',
+                     '$BUILD_DIR/mongo/bson',
+                     '$BUILD_DIR/mongo/db/common',
+                     '$BUILD_DIR/mongo/db/ops/update_driver',
+                     '$BUILD_DIR/mongo/stringutils'])
 
-env.StaticLibrary('authservercommon',
-                  ['auth_server_parameters.cpp',
-                   'authorization_manager_global.cpp',
-                   'authz_session_external_state_server_common.cpp',
-                   'security_key.cpp'],
-                  LIBDEPS=['authcore'])
+env.Library('authservercommon',
+            ['auth_server_parameters.cpp',
+             'authorization_manager_global.cpp',
+             'authz_session_external_state_server_common.cpp',
+             'security_key.cpp'],
+            LIBDEPS=['authcore'])
 
-env.StaticLibrary('authmongod',
-                  ['authz_manager_external_state_d.cpp',
-                   'authz_session_external_state_d.cpp',
-                   'auth_index_d.cpp'],
-                  LIBDEPS=['authservercommon', '$BUILD_DIR/mongo/server_parameters'])
+env.Library('authmongod',
+            ['authz_manager_external_state_d.cpp',
+             'authz_session_external_state_d.cpp',
+             'auth_index_d.cpp'],
+            LIBDEPS=['authservercommon', '$BUILD_DIR/mongo/server_parameters'])
 
-env.StaticLibrary('authmongos',
-                  ['authz_manager_external_state_s.cpp',
-                   'authz_session_external_state_s.cpp',
-                   'user_cache_invalidator_job.cpp'],
-                  LIBDEPS=['authservercommon'])
+env.Library('authmongos',
+            ['authz_manager_external_state_s.cpp',
+             'authz_session_external_state_s.cpp',
+             'user_cache_invalidator_job.cpp'],
+            LIBDEPS=['authservercommon'])
 
-env.StaticLibrary('authmocks',
-                  ['authz_manager_external_state_mock.cpp'],
-                  LIBDEPS=['$BUILD_DIR/mongo/db/ops/update_driver',
-                           '$BUILD_DIR/mongo/expressions'])
+env.Library('authmocks',
+            ['authz_manager_external_state_mock.cpp'],
+            LIBDEPS=['$BUILD_DIR/mongo/db/ops/update_driver',
+                     '$BUILD_DIR/mongo/expressions'])
 
 env.CppUnitTest('action_set_test', 'action_set_test.cpp', LIBDEPS=['authcore'])
 env.CppUnitTest('privilege_parser_test', 'privilege_parser_test.cpp', LIBDEPS=['authcore'])
diff --git a/src/mongo/db/exec/SConscript b/src/mongo/db/exec/SConscript
index 8ea8e9b577e..2cee23fa873 100644
--- a/src/mongo/db/exec/SConscript
+++ b/src/mongo/db/exec/SConscript
@@ -2,7 +2,7 @@
 
 Import("env")
 
-env.StaticLibrary(
+env.Library(
     target = "working_set",
     source = [
         "working_set.cpp",
@@ -22,7 +22,7 @@ env.CppUnitTest(
     ],
 )
 
-env.StaticLibrary(
+env.Library(
     target = "mock_stage",
     source = [
         "mock_stage.cpp",
@@ -32,7 +32,7 @@ env.StaticLibrary(
     ],
 )
 
-env.StaticLibrary(
+env.Library(
     target = 'exec',
     source = [
         "2d.cpp",
diff --git a/src/mongo/db/fts/SConscript b/src/mongo/db/fts/SConscript
index e1a1ebc2ec1..c508be06af8 100644
--- a/src/mongo/db/fts/SConscript
+++ b/src/mongo/db/fts/SConscript
@@ -24,7 +24,7 @@ env.Command( [ "stop_words_list.h", "stop_words_list.cpp"],
              [ "generate_stop_words.py"] + [ 'stop_words_%s.txt' % x for x in stop_word_lanages ],
              "$PYTHON $SOURCES $TARGETS" )
 
-env.StaticLibrary('base', [
+env.Library('base', [
         'fts_index_format.cpp',
         'fts_matcher.cpp',
         'fts_query.cpp',
@@ -41,18 +41,18 @@ env.StaticLibrary('base', [
                     "$BUILD_DIR/third_party/shim_stemmer"
                     ])
 
-env.StaticLibrary( 'server_common', [
-                   'fts_command.cpp',
-                   'fts_enabled.cpp'
-                   ] )
+env.Library( 'server_common', [
+             'fts_command.cpp',
+             'fts_enabled.cpp'
+             ] )
 
-env.StaticLibrary('ftsmongod', [
+env.Library('ftsmongod', [
         'fts_command_mongod.cpp',
         'fts_search.cpp',
         ], LIBDEPS=["base","server_common"])
 
 
-env.StaticLibrary('ftsmongos', [
+env.Library('ftsmongos', [
         'fts_command_mongos.cpp',
         ], LIBDEPS=["server_common"])
 
diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript
index 5fc97a1c488..d1ea2e844d9 100644
--- a/src/mongo/db/index/SConscript
+++ b/src/mongo/db/index/SConscript
@@ -2,7 +2,7 @@
 
 Import("env")
 
-env.StaticLibrary(
+env.Library(
         target='key_generator',
         source=[
             'btree_key_generator.cpp',
diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript
index 547dc0e1c36..fe3835f9a7d 100644
--- a/src/mongo/db/ops/SConscript
+++ b/src/mongo/db/ops/SConscript
@@ -2,7 +2,7 @@
 
 Import("env")
 
-env.StaticLibrary(
+env.Library(
     target='update_common',
     source=[
         'field_checker.cpp',
@@ -48,7 +48,7 @@ env.CppUnitTest(
     ],
 )
 
-env.StaticLibrary(
+env.Library(
     target='update',
     source=[
         'modifier_add_to_set.cpp',
@@ -196,7 +196,7 @@ env.CppUnitTest(
     ],
 )
 
-env.StaticLibrary(
+env.Library(
     target='update_driver',
     source=[
         'modifier_table.cpp',
diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript
index 9dda96b8efb..1dcaec019ae 100644
--- a/src/mongo/db/query/SConscript
+++ b/src/mongo/db/query/SConscript
@@ -2,7 +2,7 @@
 
 Import("env")
 
-env.StaticLibrary(
+env.Library(
     target='query_planner',
     source=[
         "canonical_query.cpp",
@@ -25,7 +25,7 @@ env.StaticLibrary(
     ],
 )
 
-env.StaticLibrary(
+env.Library(
     target='query',
     source=[
         "cached_plan_runner.cpp",
@@ -46,7 +46,7 @@ env.StaticLibrary(
     ],
 )
 
-env.StaticLibrary(
+env.Library(
     target="index_bounds",
     source=[
         "index_bounds.cpp",
@@ -57,7 +57,7 @@ env.StaticLibrary(
     ],
 )
 
-env.StaticLibrary(
+env.Library(
     target="lite_parsed_query",
     source=[
         "lite_parsed_query.cpp"
diff --git a/src/mongo/logger/SConscript b/src/mongo/logger/SConscript
index c3876501aef..624c2d7a923 100644
--- a/src/mongo/logger/SConscript
+++ b/src/mongo/logger/SConscript
@@ -2,21 +2,21 @@
 
 Import("env")
 
-env.StaticLibrary('logger',
-                  [
-                   'console.cpp',
-                   'log_manager.cpp',
-                   'log_severity.cpp',
-                   'logger.cpp',
-                   'logstream_builder.cpp',
-                   'message_event_utf8_encoder.cpp',
-                   'message_log_domain.cpp',
-                   'ramlog.cpp',
-                   'rotatable_file_manager.cpp',
-                   'rotatable_file_writer.cpp',
-                   ],
-                  LIBDEPS=['$BUILD_DIR/mongo/base/base',
-                           '$BUILD_DIR/mongo/util/concurrency/thread_name'])
+env.Library('logger',
+            [
+             'console.cpp',
+             'log_manager.cpp',
+             'log_severity.cpp',
+             'logger.cpp',
+             'logstream_builder.cpp',
+             'message_event_utf8_encoder.cpp',
+             'message_log_domain.cpp',
+             'ramlog.cpp',
+             'rotatable_file_manager.cpp',
+             'rotatable_file_writer.cpp',
+             ],
+            LIBDEPS=['$BUILD_DIR/mongo/base/base',
+                     '$BUILD_DIR/mongo/util/concurrency/thread_name'])
 
 # writes multi-byte sequences to console
 # to support manual testing of console stream  under Windows
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index 653eb3f7561..1e52713487f 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -6,22 +6,22 @@ Import("env")
 # Schema and backward compatibility code for "config" collections.
 #
 
-env.StaticLibrary('base', ['mongo_version_range.cpp',
-                           'range_arithmetic.cpp',
-                           'shard_key_pattern.cpp',
-                           'type_changelog.cpp',
-                           'type_chunk.cpp',
-                           'type_collection.cpp',
-                           'type_database.cpp',
-                           'type_locks.cpp',
-                           'type_lockpings.cpp',
-                           'type_settings.cpp',
-                           'type_shard.cpp',
-                           'type_config_version.cpp',
-                           'type_mongos.cpp',
-                           'type_tags.cpp'],
-                  LIBDEPS=['$BUILD_DIR/mongo/base/base',
-                           '$BUILD_DIR/mongo/bson'])
+env.Library('base', ['mongo_version_range.cpp',
+                     'range_arithmetic.cpp',
+                     'shard_key_pattern.cpp',
+                     'type_changelog.cpp',
+                     'type_chunk.cpp',
+                     'type_collection.cpp',
+                     'type_database.cpp',
+                     'type_locks.cpp',
+                     'type_lockpings.cpp',
+                     'type_settings.cpp',
+                     'type_shard.cpp',
+                     'type_config_version.cpp',
+                     'type_mongos.cpp',
+                     'type_tags.cpp'],
+            LIBDEPS=['$BUILD_DIR/mongo/base/base',
+                     '$BUILD_DIR/mongo/bson'])
 
 env.CppUnitTest('chunk_version_test', 'chunk_version_test.cpp',
                 LIBDEPS=['base',
@@ -100,13 +100,13 @@ env.Library('upgrade', ['cluster_client_internal.cpp',
 # Support for maintaining persistent sharding state and data.
 #
 
-env.StaticLibrary('metadata', ['collection_metadata.cpp',
-                               'metadata_loader.cpp'],
-                  LIBDEPS=['base',
-                           '$BUILD_DIR/mongo/bson',
-                           '$BUILD_DIR/mongo/base/base',
-                           '$BUILD_DIR/mongo/clientdriver',
-                          ])
+env.Library('metadata', ['collection_metadata.cpp',
+                         'metadata_loader.cpp'],
+            LIBDEPS=['base',
+                     '$BUILD_DIR/mongo/bson',
+                     '$BUILD_DIR/mongo/base/base',
+                     '$BUILD_DIR/mongo/clientdriver',
+                    ])
 
 env.CppUnitTest('chunk_diff_test',
                 'chunk_diff_test.cpp',
@@ -131,7 +131,7 @@ env.CppUnitTest('metadata_loader_test',
 
 # Types for write operations
 # TODO: Push upward into shared types library between mongos/mongod
-env.StaticLibrary(
+env.Library(
     target='batch_write_types',
     source=[
         'write_ops/batched_command_request.cpp',
@@ -195,7 +195,7 @@ env.CppUnitTest(
 )
 
 # Cluster write op state and execution
-env.StaticLibrary(
+env.Library(
     target='cluster_write_ops',
     source=[
         'write_ops/write_op.cpp',
@@ -260,7 +260,7 @@ env.CppUnitTest(
 )
 
 # Upconvert/Downconvert write functionality for mongos
-env.StaticLibrary(
+env.Library(
     target='cluster_write_op_conversion',
     source=[
         'write_ops/batch_upconvert.cpp',
@@ -300,7 +300,7 @@ env.CppUnitTest(
 )
 
 # Implementations of components to perform cluster operations in mongos
-env.StaticLibrary(
+env.Library(
     target='cluster_op_impl',
     source=[
         'chunk_manager_targeter.cpp',
diff --git a/src/mongo/unittest/SConscript b/src/mongo/unittest/SConscript
index 6842dd2847b..d234b39220a 100644
--- a/src/mongo/unittest/SConscript
+++ b/src/mongo/unittest/SConscript
@@ -7,17 +7,17 @@ Import("env")
 # 'network', 'foundation' and 'lasterror'.  assert_util.cpp depends on lasterror.cpp which depends
 # on sock.cpp which depends on assert_util.cpp.  Eventually we want to have an assertion library
 # that does not depend on internal server code, and then this can go away.
-env.StaticLibrary("unittest", ['unittest.cpp', 'temp_dir.cpp'],
-                  LIBDEPS=['$BUILD_DIR/mongo/foundation',
-                           '$BUILD_DIR/mongo/lasterror',
-                           '$BUILD_DIR/mongo/util/options_parser/options_parser',
-                  ])
+env.Library("unittest", ['unittest.cpp', 'temp_dir.cpp'],
+            LIBDEPS=['$BUILD_DIR/mongo/foundation',
+                     '$BUILD_DIR/mongo/lasterror',
+                     '$BUILD_DIR/mongo/util/options_parser/options_parser',
+            ])
 
-env.StaticLibrary("unittest_main", ['unittest_main.cpp'],
-                  LIBDEPS=['unittest',
-                           '$BUILD_DIR/mongo/base/base'])
+env.Library("unittest_main", ['unittest_main.cpp'],
+            LIBDEPS=['unittest',
+                     '$BUILD_DIR/mongo/base/base'])
 
-env.StaticLibrary("unittest_crutch", ['crutch.cpp'])
+env.Library("unittest_crutch", ['crutch.cpp'])
 
 
 env.CppUnitTest('unittest_test', 'unittest_test.cpp')
diff --git a/src/mongo/util/cmdline_utils/SConscript b/src/mongo/util/cmdline_utils/SConscript
index 6cdfe310ef7..1a5182442c4 100644
--- a/src/mongo/util/cmdline_utils/SConscript
+++ b/src/mongo/util/cmdline_utils/SConscript
@@ -2,8 +2,8 @@
 
 Import("env")
 
-env.StaticLibrary('cmdline_utils', ['censor_cmdline.cpp'],
-                                    LIBDEPS=['$BUILD_DIR/mongo/bson'])
+env.Library('cmdline_utils', ['censor_cmdline.cpp'],
+                              LIBDEPS=['$BUILD_DIR/mongo/bson'])
 
 env.CppUnitTest('censor_cmdline_test',
                 'censor_cmdline_test.cpp',
diff --git a/src/mongo/util/concurrency/SConscript b/src/mongo/util/concurrency/SConscript
index 60aaa5ef9e0..c80f4d9b49b 100644
--- a/src/mongo/util/concurrency/SConscript
+++ b/src/mongo/util/concurrency/SConscript
@@ -2,7 +2,7 @@
 
 Import("env")
 
-env.StaticLibrary('thread_name',
-                  ['thread_name.cpp'],
-                  LIBDEPS=['$BUILD_DIR/mongo/base/base',
-                           '$BUILD_DIR/third_party/shim_boost'])
+env.Library('thread_name',
+            ['thread_name.cpp'],
+            LIBDEPS=['$BUILD_DIR/mongo/base/base',
+                     '$BUILD_DIR/third_party/shim_boost'])
diff --git a/src/mongo/util/options_parser/SConscript b/src/mongo/util/options_parser/SConscript
index 029e1aced4f..21054497bcf 100644
--- a/src/mongo/util/options_parser/SConscript
+++ b/src/mongo/util/options_parser/SConscript
@@ -2,18 +2,18 @@
 
 Import("env")
 
-env.StaticLibrary('options_parser', ['environment.cpp',
-                                     'value.cpp',
-                                     'constraints.cpp',
-                                     'option_section.cpp',
-                                     'option_description.cpp',
-                                     'options_parser.cpp',
-                                     'startup_option_init.cpp',
-                                     'startup_options.cpp',
-                                     ],
-                                    LIBDEPS=['$BUILD_DIR/mongo/bson',
-                                             '$BUILD_DIR/third_party/shim_yaml'
-                                    ])
+env.Library('options_parser', ['environment.cpp',
+                               'value.cpp',
+                               'constraints.cpp',
+                               'option_section.cpp',
+                               'option_description.cpp',
+                               'options_parser.cpp',
+                               'startup_option_init.cpp',
+                               'startup_options.cpp',
+                               ],
+                              LIBDEPS=['$BUILD_DIR/mongo/bson',
+                                       '$BUILD_DIR/third_party/shim_yaml'
+                              ])
 
 env.CppUnitTest('options_parser_test',
                 'options_parser_test.cpp',
diff --git a/src/third_party/SConscript b/src/third_party/SConscript
index 95dc24013a6..2a52742b4a2 100644
--- a/src/third_party/SConscript
+++ b/src/third_party/SConscript
@@ -9,81 +9,81 @@ env.SConscript( [
 env.Append(CPPPATH='$BUILD_DIR/third_party/s2')
 
 if use_system_version_of_library("pcre"):
-    env.StaticLibrary( "shim_pcrecpp", ['shim_pcrecpp.cc'],
-                       SYSLIBDEPS=[
-                           env['LIBDEPS_PCRE_SYSLIBDEP'],
-                           env['LIBDEPS_PCRECPP_SYSLIBDEP']
-                       ] )
+    env.Library( "shim_pcrecpp", ['shim_pcrecpp.cc'],
+                 SYSLIBDEPS=[
+                     env['LIBDEPS_PCRE_SYSLIBDEP'],
+                     env['LIBDEPS_PCRECPP_SYSLIBDEP']
+                 ] )
 else:
     env.SConscript('pcre-${PCRE_VERSION}/SConscript')
-    env.StaticLibrary( "shim_pcrecpp", ['shim_pcrecpp.cc'],
-                       LIBDEPS=[ 'pcre-${PCRE_VERSION}/pcrecpp' ] )
+    env.Library( "shim_pcrecpp", ['shim_pcrecpp.cc'],
+                 LIBDEPS=[ 'pcre-${PCRE_VERSION}/pcrecpp' ] )
 
 if use_system_version_of_library("boost"):
-    env.StaticLibrary("shim_boost", ['shim_boost.cpp'],
-                      SYSLIBDEPS=[
-                          env['LIBDEPS_BOOST_PROGRAM_OPTIONS_SYSLIBDEP'],
-                          env['LIBDEPS_BOOST_FILESYSTEM_SYSLIBDEP'],
-                          env['LIBDEPS_BOOST_THREAD_SYSLIBDEP'],
-                          env['LIBDEPS_BOOST_SYSTEM_SYSLIBDEP']
-                      ] )
+    env.Library("shim_boost", ['shim_boost.cpp'],
+                SYSLIBDEPS=[
+                    env['LIBDEPS_BOOST_PROGRAM_OPTIONS_SYSLIBDEP'],
+                    env['LIBDEPS_BOOST_FILESYSTEM_SYSLIBDEP'],
+                    env['LIBDEPS_BOOST_THREAD_SYSLIBDEP'],
+                    env['LIBDEPS_BOOST_SYSTEM_SYSLIBDEP']
+                ] )
 else:
     env.SConscript('boost/SConscript')
-    env.StaticLibrary( "shim_boost", ['shim_boost.cpp'],
-                       LIBDEPS=[ 'boost/boost_program_options',
-                                 'boost/boost_filesystem',
-                                 'boost/boost_thread',
-                                 'boost/boost_system',
-                                 ] )
+    env.Library( "shim_boost", ['shim_boost.cpp'],
+                 LIBDEPS=[ 'boost/boost_program_options',
+                           'boost/boost_filesystem',
+                           'boost/boost_thread',
+                           'boost/boost_system',
+                           ] )
 
 if use_system_version_of_library("snappy"):
-    env.StaticLibrary("shim_snappy", ['shim_snappy.cpp'],
-                      SYSLIBDEPS=[
-                          env['LIBDEPS_SNAPPY_SYSLIBDEP']
-                      ] )
+    env.Library("shim_snappy", ['shim_snappy.cpp'],
+                SYSLIBDEPS=[
+                    env['LIBDEPS_SNAPPY_SYSLIBDEP']
+                ] )
 else:
     env.Append(CPPPATH='$BUILD_DIR/third_party/snappy')
     env.SConscript('snappy/SConscript')
-    env.StaticLibrary('shim_snappy', ['shim_snappy.cpp'], LIBDEPS=['snappy/snappy'])
+    env.Library('shim_snappy', ['shim_snappy.cpp'], LIBDEPS=['snappy/snappy'])
 
 if usev8:
     if use_system_version_of_library("v8"):
-        env.StaticLibrary("shim_v8", ['shim_v8.cpp'], SYSLIBDEPS=[
+        env.Library("shim_v8", ['shim_v8.cpp'], SYSLIBDEPS=[
             env['LIBDEPS_V8_SYSLIBDEP'] ])
     else:
         env.Append(CPPPATH='$BUILD_DIR/third_party/v8/include')
         env.SConscript('v8/SConscript')
-        env.StaticLibrary('shim_v8', ['shim_v8.cpp'], LIBDEPS=['v8/v8'])
+        env.Library('shim_v8', ['shim_v8.cpp'], LIBDEPS=['v8/v8'])
 
 if (GetOption("allocator") != "tcmalloc"):
-    env.StaticLibrary("shim_allocator", "shim_allocator.cpp")
+    env.Library("shim_allocator", "shim_allocator.cpp")
 elif use_system_version_of_library("tcmalloc"):
-    env.StaticLibrary("shim_allocator", "shim_allocator.cpp",
-                      SYSLIBDEPS=[
-                          env['LIBDEPS_TCMALLOC_SYSLIBDEP']
-                      ] )
+    env.Library("shim_allocator", "shim_allocator.cpp",
+                SYSLIBDEPS=[
+                    env['LIBDEPS_TCMALLOC_SYSLIBDEP']
+                ] )
 else:
     env.SConscript('gperftools-2.0/SConscript')
-    env.StaticLibrary('shim_allocator', 'shim_allocator.cpp',
+    env.Library('shim_allocator', 'shim_allocator.cpp',
                       LIBDEPS=['gperftools-2.0/tcmalloc_minimal'])
 
 if use_system_version_of_library("stemmer"):
-    env.StaticLibrary("shim_stemmer", ['shim_stemmer.cpp'],
-                      SYSLIBDEPS=[
-                        env['LIBDEPS_STEMMER_SYSLIBDEP']
-                      ] )
+    env.Library("shim_stemmer", ['shim_stemmer.cpp'],
+                SYSLIBDEPS=[
+                  env['LIBDEPS_STEMMER_SYSLIBDEP']
+                ] )
 else:
     env.SConscript('libstemmer_c/SConscript')
-    env.StaticLibrary("shim_stemmer", ['shim_stemmer.cpp'],
-                      LIBDEPS=['libstemmer_c/stemmer'])
+    env.Library("shim_stemmer", ['shim_stemmer.cpp'],
+                LIBDEPS=['libstemmer_c/stemmer'])
 
 if use_system_version_of_library("yaml"):
-    env.StaticLibrary("shim_yaml", ['shim_yaml.cpp'],
-                      SYSLIBDEPS=[
-                        env['LIBDEPS_YAML_SYSLIBDEP']
-                      ] )
+    env.Library("shim_yaml", ['shim_yaml.cpp'],
+                SYSLIBDEPS=[
+                  env['LIBDEPS_YAML_SYSLIBDEP']
+                ] )
 else:
     env.Append(CPPPATH='$BUILD_DIR/third_party/yaml-cpp-0.5.1/include')
     env.SConscript('yaml-cpp-0.5.1/SConscript')
-    env.StaticLibrary("shim_yaml", ['shim_yaml.cpp'],
-                      LIBDEPS=['yaml-cpp-0.5.1/yaml'])
+    env.Library("shim_yaml", ['shim_yaml.cpp'],
+                LIBDEPS=['yaml-cpp-0.5.1/yaml'])
diff --git a/src/third_party/boost/SConscript b/src/third_party/boost/SConscript
index f087fb5fdd7..5789d9556f8 100644
--- a/src/third_party/boost/SConscript
+++ b/src/third_party/boost/SConscript
@@ -2,7 +2,7 @@
 
 Import("env")
 
-env.StaticLibrary('boost_system', ['libs/system/src/error_code.cpp'])
+env.Library('boost_system', ['libs/system/src/error_code.cpp'])
 
 boost_thread_source = dict(
     posix=['libs/thread/src/pthread/once.cpp',
@@ -14,9 +14,9 @@ boost_thread_source = dict(
 
 threadlib_env = env.Clone()
 threadlib_env.Append(CPPDEFINES=['BOOST_THREAD_BUILD_LIB'])
-threadlib_env.StaticLibrary('boost_thread', boost_thread_source)
+threadlib_env.Library('boost_thread', boost_thread_source)
 
-env.StaticLibrary('boost_filesystem', [
+env.Library('boost_filesystem', [
         'libs/filesystem/v2/src/v2_operations.cpp',
         'libs/filesystem/v2/src/v2_path.cpp',
         'libs/filesystem/v2/src/v2_portability.cpp',
@@ -30,7 +30,7 @@ env.StaticLibrary('boost_filesystem', [
         'libs/filesystem/v3/src/windows_file_codecvt.cpp',
         ])
 
-env.StaticLibrary('boost_program_options', [
+env.Library('boost_program_options', [
         'libs/program_options/src/cmdline.cpp',
         'libs/program_options/src/config_file.cpp',
         'libs/program_options/src/convert.cpp',
diff --git a/src/third_party/gperftools-2.0/SConscript b/src/third_party/gperftools-2.0/SConscript
index 514a2d19fe0..1f959e113ed 100644
--- a/src/third_party/gperftools-2.0/SConscript
+++ b/src/third_party/gperftools-2.0/SConscript
@@ -92,4 +92,4 @@ def removeIfPresent(lst, item):
 for to_remove in ['-Werror', "-Wsign-compare","-Wall"]:
     removeIfPresent(env['CCFLAGS'], to_remove)
 
-env.StaticLibrary('tcmalloc_minimal', files, SYSLIBDEPS=my_SYSLIBDEPS)
+env.Library('tcmalloc_minimal', files, SYSLIBDEPS=my_SYSLIBDEPS)
diff --git a/src/third_party/libstemmer_c/SConscript b/src/third_party/libstemmer_c/SConscript
index c026011c720..b9ce21e27be 100644
--- a/src/third_party/libstemmer_c/SConscript
+++ b/src/third_party/libstemmer_c/SConscript
@@ -43,4 +43,4 @@ stemmer_files = [
     ['src_c/stem_%s.c' % p for p in stemming_packages],
     ]
 
-env.StaticLibrary( "stemmer", stemmer_files )
+env.Library( "stemmer", stemmer_files )
diff --git a/src/third_party/murmurhash3/SConscript b/src/third_party/murmurhash3/SConscript
index 7ef456e90e2..daab692df41 100644
--- a/src/third_party/murmurhash3/SConscript
+++ b/src/third_party/murmurhash3/SConscript
@@ -1,2 +1,2 @@
 Import("env")
-env.StaticLibrary("murmurhash3", ["MurmurHash3.cpp"])
+env.Library("murmurhash3", ["MurmurHash3.cpp"])
diff --git a/src/third_party/pcre-8.30/SConscript b/src/third_party/pcre-8.30/SConscript
index c7d67202a53..ea931d5cc81 100644
--- a/src/third_party/pcre-8.30/SConscript
+++ b/src/third_party/pcre-8.30/SConscript
@@ -5,7 +5,7 @@ Import( "env" )
 env = env.Clone()
 env.Append( CPPDEFINES=[ "HAVE_CONFIG_H" ] )
 
-env.StaticLibrary( "pcrecpp", [
+env.Library( "pcrecpp", [
         # pcre
         "pcre_byte_order.c",
         "pcre_compile.c",
diff --git a/src/third_party/s2/base/SConscript b/src/third_party/s2/base/SConscript
index e208968a6a9..a1f4a4720e5 100755
--- a/src/third_party/s2/base/SConscript
+++ b/src/third_party/s2/base/SConscript
@@ -6,7 +6,7 @@ env = env.Clone()
 
 env.Append(CCFLAGS=['-Isrc/third_party/s2'])
 
-env.StaticLibrary(
+env.Library(
     "base",
     [ 
 	"int128.cc",
diff --git a/src/third_party/s2/strings/SConscript b/src/third_party/s2/strings/SConscript
index 09ddba6f3a0..8ba95770af7 100755
--- a/src/third_party/s2/strings/SConscript
+++ b/src/third_party/s2/strings/SConscript
@@ -6,7 +6,7 @@ env = env.Clone()
 
 env.Append(CCFLAGS=['-Isrc/third_party/s2'])
 
-env.StaticLibrary(
+env.Library(
     "strings",
     [ 
 	"split.cc",
diff --git a/src/third_party/s2/util/coding/SConscript b/src/third_party/s2/util/coding/SConscript
index 15f77f28ad3..9dbc03b4818 100755
--- a/src/third_party/s2/util/coding/SConscript
+++ b/src/third_party/s2/util/coding/SConscript
@@ -7,7 +7,7 @@ env = env.Clone()
 env.Append(CCFLAGS=['-Isrc/third_party/s2'])
 env.Append(CCFLAGS=['-Isrc/third_party/gflags-2.0/src'])
 
-env.StaticLibrary(
+env.Library(
     "coding",
     [ 
 	"coder.cc",
diff --git a/src/third_party/s2/util/math/SConscript b/src/third_party/s2/util/math/SConscript
index af51445de1d..e88c4898b60 100755
--- a/src/third_party/s2/util/math/SConscript
+++ b/src/third_party/s2/util/math/SConscript
@@ -11,7 +11,7 @@ if solaris:
     # Enables declaration of isinf() on Solaris
     env.Append(CPPDEFINES=['__C99FEATURES__'])
 
-env.StaticLibrary("math",
-                [ "mathutil.cc",
-                 # "mathlimits.cc",
-                ])
+env.Library("math",
+          [ "mathutil.cc",
+           # "mathlimits.cc",
+          ])
diff --git a/src/third_party/snappy/SConscript b/src/third_party/snappy/SConscript
index 0eb74878806..9a227a385e7 100644
--- a/src/third_party/snappy/SConscript
+++ b/src/third_party/snappy/SConscript
@@ -6,4 +6,4 @@ if not windows:
     env = env.Clone()
     env.Append(CCFLAGS=['-Wno-sign-compare', '-Wno-unused-function'])
 
-env.StaticLibrary('snappy', ['snappy.cc', 'snappy-sinksource.cc'])
+env.Library('snappy', ['snappy.cc', 'snappy-sinksource.cc'])
diff --git a/src/third_party/v8/SConscript b/src/third_party/v8/SConscript
index a464b5b942a..11dc7df3a68 100644
--- a/src/third_party/v8/SConscript
+++ b/src/third_party/v8/SConscript
@@ -389,4 +389,4 @@ library_files = [('src/'+s) for s in LIBRARY_FILES]
 library_files.append('src/macros.py')
 env.JS2C(['src/libraries.cc'], library_files, TYPE='CORE', COMPRESSION='off')
 
-env.StaticLibrary("v8", sources)
+env.Library("v8", sources)