diff options
Diffstat (limited to 'src/third_party/SConscript')
| -rw-r--r-- | src/third_party/SConscript | 40 |
1 files changed, 14 insertions, 26 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index af08535b963..4eb7c79d9c8 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -32,6 +32,15 @@ thirdPartyEnvironmentModifications = { 'timelib': {'CPPPATH': ['#/src/third_party/timelib' + timelibSuffix], }, 'unwind': {}, 'variant': {'CPPPATH': ['#src/third_party/variant' + variantSuffix + '/include'], }, + 'mozjs': { + 'CPPPATH': [ + '#/src/third_party/mozjs/include', + '#/src/third_party/mozjs/mongo_sources', + '#/src/third_party/mozjs/platform/' + env["TARGET_ARCH"] + "/" + env["TARGET_OS"] + + "/include", + ], + 'FORCEINCLUDES': ['js-config.h', ], + } } @@ -73,7 +82,7 @@ if not use_system_version_of_library('pcre'): if not use_system_version_of_library('pcre2'): thirdPartyEnvironmentModifications['pcre2'] = { - 'CPPPATH': ['#/src/third_party/pcre2'], + 'CPPPATH': ['#/src/third_party/pcre2/src'], } if not use_system_version_of_library('boost'): @@ -124,21 +133,6 @@ if not use_system_version_of_library('google-benchmark'): 'CPPPATH': ['#/src/third_party/benchmark/dist/include'], } -# TODO: figure out if we want to offer system versions of mozjs. Mozilla -# hasn't offered a source tarball since 24, but in theory they could. -# -#if not use_system_version_of_library('mozjs'): -if True: - thirdPartyEnvironmentModifications['mozjs'] = { - 'CPPPATH': [ - '#/src/third_party/mozjs/include', - '#/src/third_party/mozjs/mongo_sources', - '#/src/third_party/mozjs/platform/' + env["TARGET_ARCH"] + "/" + env["TARGET_OS"] + - "/include", - ], - 'FORCEINCLUDES': ['js-config.h', ], - } - if "tom" in env["MONGO_CRYPTO"]: thirdPartyEnvironmentModifications['tomcrypt'] = { 'CPPPATH': ['#/src/third_party/tomcrypt' + tomcryptSuffix + '/src/headers'], @@ -269,6 +263,10 @@ s2Env.InjectThirdParty(libraries=[ s2Env.InjectMongoIncludePaths() s2Env.SConscript('s2/SConscript', exports={'env': s2Env}) +if jsEngine: + mozjsEnv = env.Clone() + mozjsEnv.SConscript('mozjs/SConscript', exports={'env': mozjsEnv}) + if use_libunwind: unwindEnv = env.Clone(LIBDEPS_NO_INHERIT=[ '$BUILD_DIR/third_party/shim_allocator', @@ -448,16 +446,6 @@ else: benchmarkEnv.ShimLibrary(name="benchmark") -if jsEngine: - mozjsEnv = env.Clone() - mozjsEnv.SConscript('mozjs/SConscript', exports={'env': mozjsEnv}) - mozjsEnv = mozjsEnv.Clone(LIBDEPS_INTERFACE=[ - 'mozjs/mozjs', - 'shim_zlib', - ]) - - mozjsEnv.ShimLibrary(name="mozjs") - if "tom" in env["MONGO_CRYPTO"]: tomcryptEnv = env.Clone() tomcryptEnv.SConscript( |