diff options
| author | Jason Rassi <rassi@10gen.com> | 2015-10-13 17:58:48 -0400 |
|---|---|---|
| committer | Jason Rassi <rassi@10gen.com> | 2015-10-13 18:23:17 -0400 |
| commit | 90cd064713dfcf5c82be07742f7377c83ea0a4f2 (patch) | |
| tree | ae349a2dcaa3cb28861e083c367450e47453a1e0 /src | |
| parent | b3b1be01f9c8f2f6a9e303602fb070aa854f5cf3 (diff) | |
| download | mongo-90cd064713dfcf5c82be07742f7377c83ea0a4f2.tar.gz | |
SERVER-20646 libasync_results_merger needs to depend on libcoreshard
Fixes an issue introduced in 15350b50 where libasync_results_merger
was made to depend on mongo::grid, but the symbol cannot be resolved
at link time.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/s/query/SConscript | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mongo/s/query/SConscript b/src/mongo/s/query/SConscript index cf7c5e406dd..dd0c741e72e 100644 --- a/src/mongo/s/query/SConscript +++ b/src/mongo/s/query/SConscript @@ -9,7 +9,6 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/query/query_common', - "$BUILD_DIR/mongo/s/coreshard", "cluster_client_cursor", "cluster_cursor_cleanup_job", "store_possible_cursor", @@ -49,7 +48,6 @@ env.CppUnitTest( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/auth/authorization_manager_mock_init', - "$BUILD_DIR/mongo/s/coreshard", "$BUILD_DIR/mongo/s/mongoscore", "router_exec_stage", ], @@ -65,6 +63,7 @@ env.Library( "$BUILD_DIR/mongo/db/query/command_request_response", "$BUILD_DIR/mongo/executor/task_executor_interface", "$BUILD_DIR/mongo/s/client/sharding_client", + "$BUILD_DIR/mongo/s/coreshard", ], ) @@ -87,7 +86,6 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/auth/authorization_manager_mock_init', "$BUILD_DIR/mongo/db/query/lite_parsed_query", "$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture", - "$BUILD_DIR/mongo/s/coreshard", "$BUILD_DIR/mongo/s/mongoscore", "$BUILD_DIR/mongo/s/sharding_test_fixture", "async_results_merger", @@ -156,7 +154,6 @@ env.CppUnitTest( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/auth/authorization_manager_mock_init', - "$BUILD_DIR/mongo/s/coreshard", "$BUILD_DIR/mongo/s/mongoscore", "cluster_client_cursor", ], |