SERVER-18531 Integrate SpiderMonkey

Provides SpiderMonkey 38.0.1esr as a JS engine for mongo and mongod.

1 files changed, 7 insertions, 7 deletions

diff --git a/SConstruct b/SConstruct
index 33312bc9439..c25ad2ce68b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -214,7 +214,7 @@ add_option('wiredtiger',
 )
 
 # library choices
-js_engine_choices = ['v8-3.12', 'v8-3.25', 'none']
+js_engine_choices = ['v8-3.12', 'v8-3.25', 'mozjs', 'none']
 add_option('js-engine',
     choices=js_engine_choices,
     default=js_engine_choices[0],
@@ -756,12 +756,14 @@ jsEngine = get_option( "js-engine")
 
 serverJs = get_option( "server-js" ) == "on"
 
-usev8 = (jsEngine != 'none')
+usev8 = (jsEngine.startswith('v8'))
+
+usemozjs = (jsEngine.startswith('mozjs'))
 
 v8version = jsEngine[3:] if jsEngine.startswith('v8-') else 'none'
 v8suffix = '' if v8version == '3.12' else '-' + v8version
 
-if not serverJs and not usev8:
+if not serverJs and not usev8 and not usemozjs:
     print("Warning: --server-js=off is not needed with --js-engine=none")
 
 # We defer building the env until we have determined whether we want certain values. Some values
@@ -1197,12 +1199,9 @@ elif env.TargetOSIs('windows'):
                      'DbgHelp.lib',
                      'shell32.lib',
                      'Iphlpapi.lib',
+                     'winmm.lib',
                      'version.lib'])
 
-    # v8 calls timeGetTime()
-    if usev8:
-        env.Append(LIBS=['winmm.lib'])
-
 # When building on visual studio, this sets the name of the debug symbols file
 if env.ToolchainIs('msvc'):
     env['PDB'] = '${TARGET.base}.pdb'
@@ -2303,6 +2302,7 @@ Export("get_option")
 Export("has_option use_system_version_of_library")
 Export("serverJs")
 Export("usev8")
+Export("usemozjs")
 Export("v8version v8suffix")
 Export("boostSuffix")
 Export('module_sconscripts')