diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2014-02-18 17:18:17 -0500 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2014-02-18 17:19:39 -0500 |
| commit | 40b314894c7de615b09d633774f9146e4b097b02 (patch) | |
| tree | ab256718fc63738b62978bc99d36155eb2107546 /SConstruct | |
| parent | c43cc49609612800c37444de3a4ca0b434a8e061 (diff) | |
| download | mongo-40b314894c7de615b09d633774f9146e4b097b02.tar.gz | |
SERVER-12304 Query concurrency -- 2.6 regression
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 52de5c1802a..abc794769c6 100644 --- a/SConstruct +++ b/SConstruct @@ -747,7 +747,11 @@ elif windows: # c4244 # 'conversion' conversion from 'type1' to 'type2', possible loss of data # An integer type is converted to a smaller integer type. - env.Append( CCFLAGS=["/wd4355", "/wd4800", "/wd4267", "/wd4244"] ) + # c4290 + # C++ exception specification ignored except to indicate a function is not __declspec(nothrow + # A function is declared using exception specification, which Visual C++ accepts but does not + # implement + env.Append( CCFLAGS=["/wd4355", "/wd4800", "/wd4267", "/wd4244", "/wd4290"] ) # some warnings we should treat as errors: # c4099 @@ -793,7 +797,10 @@ elif windows: if optBuild: # /O2: optimize for speed (as opposed to size) # /Oy-: disable frame pointer optimization (overrides /O2, only affects 32-bit) + # /INCREMENTAL: NO - disable incremental link - avoid the level of indirection for function + # calls env.Append( CCFLAGS=["/O2", "/Oy-"] ) + env.Append( LINKFLAGS=["/INCREMENTAL:NO"]) else: env.Append( CCFLAGS=["/Od"] ) |