xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SERVER-61008 Rename mozjs-60 directory to mozjs

Browse Source
This commit is contained in:
Mohammad Dashti
2021-12-01 18:53:05 +00:00
committed by Evergreen Agent
parent a309ad8c22
commit 44eaf87f83
1869 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/third_party/SConscript vendored
View File

@@ -12,7 +12,6 @@ snappySuffix = '-1.1.7'
zlibSuffix = '-1.2.11'
zstdSuffix = '-1.4.4'
pcreSuffix = "-8.42"
mozjsSuffix = '-60'
icuSuffix = '-57.1'
timelibSuffix = '-2021.06'
tomcryptSuffix = '-1.18.2'
@@ -141,9 +140,9 @@ if not use_system_version_of_library('google-benchmark'):
if True:
thirdPartyEnvironmentModifications['mozjs'] = {
'CPPPATH' : [
'#/src/third_party/mozjs' + mozjsSuffix + '/include',
'#/src/third_party/mozjs' + mozjsSuffix + '/mongo_sources',
'#/src/third_party/mozjs' + mozjsSuffix + '/platform/' + env["TARGET_ARCH"] + "/" + env["TARGET_OS"] + "/include",
'#/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',
@@ -393,7 +392,7 @@ else:
LIBDEPS_INTERFACE=[
abseilDirectory + '/absl_container',
abseilDirectory + '/absl_hash',
abseilDirectory + '/absl_numeric',
abseilDirectory + '/absl_numeric',
])
abseilEnv.ShimLibrary(name="abseil")
@@ -475,10 +474,10 @@ benchmarkEnv.ShimLibrary(name="benchmark")
if usemozjs:
mozjsEnv = env.Clone()
mozjsEnv.SConscript('mozjs' + mozjsSuffix + '/SConscript', exports={'env' : mozjsEnv })
mozjsEnv.SConscript('mozjs/SConscript', exports={'env' : mozjsEnv })
mozjsEnv = mozjsEnv.Clone(
LIBDEPS_INTERFACE=[
'mozjs' + mozjsSuffix + '/mozjs',
'mozjs/mozjs',
'shim_zlib',
])