diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2020-07-30 14:46:45 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-07-30 19:30:10 +0000 |
| commit | 6aeb26d871314453df56d0c534af8d1994e9786c (patch) | |
| tree | af8e13f24cfa21b3e86669612bbe9662ed0f8ed2 /src | |
| parent | 06169f718a7aec04f952979ffa6590e4334dea5a (diff) | |
| download | mongo-6aeb26d871314453df56d0c534af8d1994e9786c.tar.gz | |
SERVER-48741 Merge socket and ssl_manager libraries
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/shell/SConscript | 1 | ||||
| -rw-r--r-- | src/mongo/transport/SConscript | 1 | ||||
| -rw-r--r-- | src/mongo/util/net/SConscript | 18 |
3 files changed, 2 insertions, 18 deletions
diff --git a/src/mongo/shell/SConscript b/src/mongo/shell/SConscript index 3df7ab3f627..3927f74694e 100644 --- a/src/mongo/shell/SConscript +++ b/src/mongo/shell/SConscript @@ -159,7 +159,6 @@ kmsEnv.Library( '$BUILD_DIR/mongo/crypto/aead_encryption', '$BUILD_DIR/mongo/db/commands/test_commands_enabled', '$BUILD_DIR/mongo/util/net/network', - '$BUILD_DIR/mongo/util/net/socket', '$BUILD_DIR/mongo/util/net/ssl_manager', '$BUILD_DIR/mongo/util/net/ssl_options', '$BUILD_DIR/third_party/shim_kms_message', diff --git a/src/mongo/transport/SConscript b/src/mongo/transport/SConscript index 1f7f6a16107..48f7c7011b8 100644 --- a/src/mongo/transport/SConscript +++ b/src/mongo/transport/SConscript @@ -188,7 +188,6 @@ tlEnv.CppUnitTest( '$BUILD_DIR/mongo/rpc/rpc', '$BUILD_DIR/mongo/unittest/unittest', '$BUILD_DIR/mongo/util/clock_source_mock', - '$BUILD_DIR/mongo/util/net/socket', '$BUILD_DIR/third_party/shim_asio', 'message_compressor', 'message_compressor_options_server', diff --git a/src/mongo/util/net/SConscript b/src/mongo/util/net/SConscript index b4600acd11a..e60b37cddb2 100644 --- a/src/mongo/util/net/SConscript +++ b/src/mongo/util/net/SConscript @@ -74,20 +74,6 @@ env.Library( ) env.Library( - target='socket', - source=[ - "sock.cpp", - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], - LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/util/fail_point', - 'network', - ] -) - -env.Library( target='ssl_types', source=[ "ssl_types.cpp", @@ -116,6 +102,7 @@ if not get_option('ssl') == 'off': env.Library( target='ssl_manager', source=[ + "sock.cpp", "private/ssl_expiration.cpp", "ssl_manager.cpp", "ssl_parameters.cpp", @@ -134,7 +121,6 @@ if not get_option('ssl') == 'off': '$BUILD_DIR/third_party/shim_asio', 'network', 'openssl_init' if ssl_provider == 'openssl' else '', - 'socket', 'ssl_options', 'ssl_types', ], @@ -168,6 +154,7 @@ else: env.Library( target='ssl_manager', source=[ + "sock.cpp", "ssl_manager_none.cpp", ], LIBDEPS=[ @@ -242,7 +229,6 @@ if get_option('ssl') == 'on': ], LIBDEPS=[ 'network', - 'socket', 'ssl_manager', 'ssl_options_server', '$BUILD_DIR/mongo/db/server_options_servers', |