diff options
| author | Andrew Morrow <acm@mongodb.com> | 2017-12-28 16:50:44 -0500 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2017-12-29 11:16:37 -0500 |
| commit | 39a57e323f2b763adb67b848a17c74cc233350c4 (patch) | |
| tree | cb1a8c642f85af81daf2c76142fa6d3dec231617 /src/mongo/s | |
| parent | a0210b2e83641619eed60c8b19eb1abd7cf37fa1 (diff) | |
| download | mongo-39a57e323f2b763adb67b848a17c74cc233350c4.tar.gz | |
SERVER-32479 Make all library names unique
Diffstat (limited to 'src/mongo/s')
| -rw-r--r-- | src/mongo/s/SConscript | 12 | ||||
| -rw-r--r-- | src/mongo/s/catalog/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/s/write_ops/SConscript | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript index cf17015bcc4..721510e47b1 100644 --- a/src/mongo/s/SConscript +++ b/src/mongo/s/SConscript @@ -64,7 +64,7 @@ env.Library( ) env.Library( - target='common', + target='common_s', source=[ 'catalog/mongo_version_range.cpp', 'catalog/type_changelog.cpp', @@ -206,7 +206,7 @@ env.CppUnitTest( 'shard_id_test.cpp', ], LIBDEPS=[ - 'common', + 'common_s', ] ) @@ -232,7 +232,7 @@ env.CppUnitTest( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/query/query_test_service_context', - 'common', + 'common_s', ] ) @@ -248,7 +248,7 @@ env.CppUnitTest('request_types_test', 'request_types/update_zone_key_range_request_test.cpp', ], LIBDEPS=[ - 'common', + 'common_s', ], ) @@ -260,7 +260,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/storage/key_string', - 'common', + 'common_s', ], ) @@ -286,7 +286,7 @@ env.Library( '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client', '$BUILD_DIR/mongo/s/query/cluster_cursor_manager', '$BUILD_DIR/mongo/util/concurrency/thread_pool', - 'common', + 'common_s', 'routing_table', #'client/sharding_client', # CYCLE ], diff --git a/src/mongo/s/catalog/SConscript b/src/mongo/s/catalog/SConscript index aed7e63ab86..801ade62c4c 100644 --- a/src/mongo/s/catalog/SConscript +++ b/src/mongo/s/catalog/SConscript @@ -64,7 +64,7 @@ env.Library( 'dist_lock_catalog_mock.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/s/common', + '$BUILD_DIR/mongo/s/common_s', '$BUILD_DIR/mongo/unittest/unittest', 'dist_lock_catalog_interface', ] diff --git a/src/mongo/s/write_ops/SConscript b/src/mongo/s/write_ops/SConscript index f13ba6c096f..5229bdfab6e 100644 --- a/src/mongo/s/write_ops/SConscript +++ b/src/mongo/s/write_ops/SConscript @@ -17,7 +17,7 @@ env.Library( '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/ops/write_ops_parsers', '$BUILD_DIR/mongo/db/repl/optime', - '$BUILD_DIR/mongo/s/common', + '$BUILD_DIR/mongo/s/common_s', ], ) |