diff options
| author | Gabriel Russell <gabriel.russell@mongodb.com> | 2019-01-29 23:16:33 +0000 |
|---|---|---|
| committer | Gabriel Russell <gabriel.russell@mongodb.com> | 2019-01-29 23:16:33 +0000 |
| commit | 254fff93270089e8ac33be3f7e079aa8bfc3f7bc (patch) | |
| tree | ef7f69b2cacc081a16b4da1b58c327f29ae0b8b4 /SConstruct | |
| parent | a3d232b697dfc7c8833fc1855abbc190fe0d5970 (diff) | |
| download | mongo-254fff93270089e8ac33be3f7e079aa8bfc3f7bc.tar.gz | |
Revert "SERVER-29286 import and use mozjs-60"
This reverts commit a3d232b697dfc7c8833fc1855abbc190fe0d5970.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/SConstruct b/SConstruct index 9bc1129ad5f..e5f794b4b94 100644 --- a/SConstruct +++ b/SConstruct @@ -1652,11 +1652,6 @@ elif env.TargetOSIs('windows'): env.Append( CCFLAGS=["/wd4355", "/wd4800", "/wd4267", "/wd4244", "/wd4290", "/wd4068", "/wd4351", "/wd4373"] ) - # mozjs-60 requires the following - # 'declaration' : no matching operator delete found; memory will not be freed if - # initialization throws an exception - env.Append( CCFLAGS=["/wd4291"] ) - # some warnings we should treat as errors: # c4013 # 'function' undefined; assuming extern returning int @@ -1684,7 +1679,7 @@ elif env.TargetOSIs('windows'): #env.Append( CCFLAGS=['/Yu"pch.h"'] ) # Don't send error reports in case of internal compiler error - env.Append( CCFLAGS= ["/errorReport:none"] ) + env.Append( CCFLAGS= ["/errorReport:none"] ) # Select debugging format. /Zi gives faster links but seem to use more memory if get_option('msvc-debugging-format') == "codeview": @@ -1859,7 +1854,7 @@ if env.TargetOSIs('posix'): if optBuild and not optBuildForSize: env.Append( CCFLAGS=["-O2"] ) - elif optBuild and optBuildForSize: + elif optBuild and optBuildForSize: env.Append( CCFLAGS=["-Os"] ) else: env.Append( CCFLAGS=["-O0"] ) @@ -3413,7 +3408,7 @@ def doConfigure(myenv): if conf.CheckExtendedAlignment(size): conf.env.SetConfigHeaderDefine("MONGO_CONFIG_MAX_EXTENDED_ALIGNMENT", size) break - + def CheckMongoCMinVersion(context): compile_test_body = textwrap.dedent(""" #include <mongoc/mongoc.h> @@ -3429,7 +3424,7 @@ def doConfigure(myenv): return result conf.AddTest('CheckMongoCMinVersion', CheckMongoCMinVersion) - + if env.TargetOSIs('darwin'): def CheckMongoCFramework(context): context.Message("Checking for mongoc_get_major_version() in darwin framework mongoc...") @@ -3449,7 +3444,7 @@ def doConfigure(myenv): context.Result(result) context.env['FRAMEWORKS'] = lastFRAMEWORKS return result - + conf.AddTest('CheckMongoCFramework', CheckMongoCFramework) mongoc_mode = get_option('use-system-mongo-c') @@ -3461,7 +3456,7 @@ def doConfigure(myenv): "C", "mongoc_get_major_version();", autoadd=False ): - conf.env['MONGO_HAVE_LIBMONGOC'] = "library" + conf.env['MONGO_HAVE_LIBMONGOC'] = "library" if not conf.env['MONGO_HAVE_LIBMONGOC'] and env.TargetOSIs('darwin') and conf.CheckMongoCFramework(): conf.env['MONGO_HAVE_LIBMONGOC'] = "framework" if not conf.env['MONGO_HAVE_LIBMONGOC'] and mongoc_mode == 'on': |