diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2011-08-24 11:09:26 -0400 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2011-08-24 11:13:57 -0400 |
| commit | 0dd179510c64c16713215632d31afbdaebe71399 (patch) | |
| tree | 5c9e26de8519612deb299d1d71f85470a2566b86 | |
| parent | a1b1601affd2f412e830115694177be3298a358e (diff) | |
| download | mongo-0dd179510c64c16713215632d31afbdaebe71399.tar.gz | |
fix sm for windows SERVER-3659
| -rw-r--r-- | SConstruct | 3 | ||||
| -rw-r--r-- | third_party/sm.py | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 8b36a6c9b8b..405eae84f8b 100644 --- a/SConstruct +++ b/SConstruct @@ -599,7 +599,8 @@ elif "win32" == os.sys.platform: # /Gm is minimal rebuild, but may not work in parallel mode. if release: env.Append( CPPDEFINES=[ "NDEBUG" ] ) - env.Append( CPPFLAGS= " /O2 /MT /Gy /Zi /TP /errorReport:none " ) + env.Append( CPPFLAGS= " /O2 /Gy " ) + env.Append( CPPFLAGS= " /MT /Zi /TP /errorReport:none " ) # TODO: this has caused some linking problems : # /GL whole program optimization # /LTCG link time code generation diff --git a/third_party/sm.py b/third_party/sm.py index 2b21fb60191..53e7984b8ae 100644 --- a/third_party/sm.py +++ b/third_party/sm.py @@ -59,6 +59,10 @@ def configure( env , fileLists , options ): if options["windows"]: myenv["CPPFLAGS"] = myenv["CPPFLAGS"].replace( "/TP" , "" ) + myenv["CPPFLAGS"] = myenv["CPPFLAGS"].replace( "/O2" , "" ) + myenv["CPPFLAGS"] = myenv["CPPFLAGS"].replace( "/Gy" , "" ) + myenv.Append( CPPFLAGS=" /wd4748 " ) + if "NDEBUG" in myenv["CPPDEFINES"]: myenv["CPPDEFINES"].remove( "NDEBUG" ) |