diff options
| author | Daniel Moody <dmoody256@gmail.com> | 2022-09-27 14:12:15 -0500 |
|---|---|---|
| committer | Daniel Moody <daniel.moody@rhel74-z-dev.dallasisv.build.10gen.cc> | 2022-09-28 18:51:50 +0000 |
| commit | 128dd44f10210294e9f8dd224fe70fb43eefad13 (patch) | |
| tree | f263e490198b177aa352c3049086ea367b1ca3f7 | |
| parent | f5c6dc83b252ed2f2ea9baa8a14065f2b4e981b8 (diff) | |
| download | mongo-128dd44f10210294e9f8dd224fe70fb43eefad13.tar.gz | |
make test run on windows
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | site_scons/site_tools/ninja.py | 2 | ||||
| -rw-r--r-- | src/third_party/grpc/SConscript | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 59c2228c855..9226da84837 100644 --- a/SConstruct +++ b/SConstruct @@ -5329,7 +5329,7 @@ if get_option('ninja') != 'disabled': # sources and ninja, this list can be removed. env['NINJA_PREGEN_SOURCE_TARGETS'] = [ 'third_party/protobuf', - env.Dir('$DESTDIR').path, + env.Dir('$DESTDIR').path.replace('\\', '/'), 'third_party/zlib', 'shim_zlib', 'shim_allocator', diff --git a/site_scons/site_tools/ninja.py b/site_scons/site_tools/ninja.py index 2b2fe875d89..732c1fe3aa2 100644 --- a/site_scons/site_tools/ninja.py +++ b/site_scons/site_tools/ninja.py @@ -813,7 +813,7 @@ class NinjaState: depends_on_gen_source = False if build['outputs']: depends_on_gen_source = all([ - True if gen_source_exception not in build['outputs'][0] else False + True if gen_source_exception not in build['outputs'][0].replace('\\', '/') else False for gen_source_exception in self.env.get('NINJA_PREGEN_SOURCE_TARGETS', []) ]) diff --git a/src/third_party/grpc/SConscript b/src/third_party/grpc/SConscript index 5403462d097..2f12a140332 100644 --- a/src/third_party/grpc/SConscript +++ b/src/third_party/grpc/SConscript @@ -873,7 +873,7 @@ lib_node = grpcxx_env.Library( ) grpc_unittest_env = grpcxx_env.Clone() -grpc_unittest_env.InjectThirdParty(libraries=['fmt', 'variant']) +grpc_unittest_env.InjectThirdParty(libraries=['fmt', 'variant', 'boost', 'safeint']) grpc_unittest_env.Append( CPPPATH=[ '#src', @@ -892,4 +892,8 @@ grpc_unittest_env.CppUnitTest( '$BUILD_DIR/mongo/base', 'grpc++_reflection', ], + SYSLIBDEPS=[ + 'ssl', + 'crypto' + ] )
\ No newline at end of file |