SERVER-33581 New msvc-debugging-format SCons option that allow for compiling with /Zi instead of /Z7 with msvc which improves link times.

1 files changed, 15 insertions, 4 deletions

diff --git a/SConstruct b/SConstruct
index 34f7f8eb863..a16d9aaa967 100644
--- a/SConstruct
+++ b/SConstruct
@@ -495,6 +495,13 @@ add_option('android-toolchain-path',
     help="Android NDK standalone toolchain path. Required when using --variables-files=etc/scons/android_ndk.vars",
 )
 
+add_option('msvc-debugging-format',
+    choices=["codeview", "pdb"],
+    default="codeview",
+    help='Debugging format in debug builds using msvc. Codeview (/Z7) or Program database (/Zi). Default is codeview.',
+    type='choice',
+)
+
 try:
     with open("version.json", "r") as version_fp:
         version_data = json.load(version_fp)
@@ -1570,10 +1577,14 @@ elif env.TargetOSIs('windows'):
     # this would be for pre-compiled headers, could play with it later
     #env.Append( CCFLAGS=['/Yu"pch.h"'] )
 
-    # docs say don't use /FD from command line (minimal rebuild)
-    # /Gy function level linking (implicit when using /Z7)
-    # /Z7 debug info goes into each individual .obj file -- no .pdb created
-    env.Append( CCFLAGS= ["/Z7", "/errorReport:none"] )
+    # Don't send error reports in case of internal compiler error
+    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":
+        env['CCPDBFLAGS'] = "/Z7"
+    elif get_option('msvc-debugging-format') == "pdb":
+        env['CCPDBFLAGS'] = '/Zi /Fd${TARGET}.pdb'
 
     # /DEBUG will tell the linker to create a .pdb file
     # which WinDbg and Visual Studio will use to resolve