diff options
| author | Sara Golemon <sara.golemon@mongodb.com> | 2018-08-06 20:04:53 +0000 |
|---|---|---|
| committer | Sara Golemon <sara.golemon@mongodb.com> | 2018-08-06 21:45:09 +0000 |
| commit | 98dc4d98744a8da6567754345eb906ed01f5486f (patch) | |
| tree | 68689cf559e25c1fbb00e4d85849c54b8bbed961 /src/mongo | |
| parent | 34f4a07baf2e164f604ce53fd092b7dc1792e9db (diff) | |
| download | mongo-98dc4d98744a8da6567754345eb906ed01f5486f.tar.gz | |
SERVER-36292 Fix thread_pool_task_executor dependency
Diffstat (limited to 'src/mongo')
| -rw-r--r-- | src/mongo/db/repl/SConscript | 4 | ||||
| -rw-r--r-- | src/mongo/executor/SConscript | 5 | ||||
| -rw-r--r-- | src/mongo/s/SConscript | 6 | ||||
| -rw-r--r-- | src/mongo/util/net/SConscript | 1 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript index 06c1d23ee06..db50f0278c7 100644 --- a/src/mongo/db/repl/SConscript +++ b/src/mongo/db/repl/SConscript @@ -143,12 +143,10 @@ env.Library( '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception', '$BUILD_DIR/mongo/db/server_parameters', '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/executor/network_interface_factory', - '$BUILD_DIR/mongo/executor/task_executor_interface', - '$BUILD_DIR/mongo/executor/thread_pool_task_executor', '$BUILD_DIR/mongo/util/concurrency/thread_pool', ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/executor/thread_pool_task_executor', '$BUILD_DIR/mongo/db/commands/test_commands_enabled', ], ) diff --git a/src/mongo/executor/SConscript b/src/mongo/executor/SConscript index 2b3286f9d0d..af9be6312b1 100644 --- a/src/mongo/executor/SConscript +++ b/src/mongo/executor/SConscript @@ -181,10 +181,10 @@ env.Library( 'network_interface_factory.cpp', ], LIBDEPS=[ - 'network_interface', 'connection_pool_executor', ], LIBDEPS_PRIVATE=[ + 'network_interface', 'network_interface_tl', 'egress_tag_closer_manager', ]) @@ -212,6 +212,9 @@ env.Library( 'task_executor_interface', '$BUILD_DIR/mongo/util/fail_point', '$BUILD_DIR/mongo/db/service_context', + ], + LIBDEPS_PRIVATE=[ + 'network_interface', ] ) diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript index 4bb567eaf36..189db0f56f7 100644 --- a/src/mongo/s/SConscript +++ b/src/mongo/s/SConscript @@ -78,9 +78,6 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/db/logical_session_cache_factory_mongos', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', - '$BUILD_DIR/mongo/executor/network_interface_factory', - '$BUILD_DIR/mongo/executor/network_interface_thread_pool', - '$BUILD_DIR/mongo/executor/thread_pool_task_executor', '$BUILD_DIR/mongo/s/catalog/dist_lock_catalog_impl', '$BUILD_DIR/mongo/s/catalog/replset_dist_lock_manager', '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client_impl', @@ -89,6 +86,9 @@ env.Library( 'coreshard', 'sharding_task_executor', ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/executor/thread_pool_task_executor', + ] ) env.Library( diff --git a/src/mongo/util/net/SConscript b/src/mongo/util/net/SConscript index 9c83d04bcbe..1aba944ad3f 100644 --- a/src/mongo/util/net/SConscript +++ b/src/mongo/util/net/SConscript @@ -175,7 +175,6 @@ else: ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/executor/thread_pool_task_executor', - '$BUILD_DIR/mongo/executor/network_interface', ], SYSLIBDEPS=[ 'winhttp' if env.TargetOSIs('windows') else 'curl', |