From c78db512f228a524f70d3d13891427b9f13a7f04 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Fri, 26 Mar 2021 17:30:36 +0100 Subject: [PATCH 1/2] Windows: use -Z7 instead of -Zi to generate debug symbols "C7 compatible" or "old-style" debug information is kept local in the translation unit (.obj file) and does not create issues with parallel builds --- configure/os/CONFIG.win32-x86.win32-x86 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index 6a5078d60..f92856205 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -49,9 +49,9 @@ OPT_CFLAGS_YES_NO = -Ox -Oy- OPT_CFLAGS_YES = $(OPT_CFLAGS_YES_$(OPT_WHOLE_PROGRAM)) # -# -Zi generate program database for debugging information +# -Z7 generate C7 compatible debugging information (inside .obj) # -RTCsu enable run-time error checks -OPT_CFLAGS_NO = -Zi -RTCsu +OPT_CFLAGS_NO = -Z7 -RTCsu # specify object file name and location OBJ_CFLAG = -Fo @@ -116,9 +116,9 @@ OPT_CXXFLAGS_YES_NO = -Ox -Oy- OPT_CXXFLAGS_YES = $(OPT_CXXFLAGS_YES_$(OPT_WHOLE_PROGRAM)) # -# -Zi generate program database for debugging information +# -Z7 generate C7 compatible debugging information (inside .obj) # -RTCsu enable run-time error checks -OPT_CXXFLAGS_NO = -RTCsu -Zi +OPT_CXXFLAGS_NO = -RTCsu -Z7 # specify object file name and location OBJ_CXXFLAG = -Fo From fa069b0845b09b587ae327b6e452a623c4262662 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 29 Mar 2021 17:49:02 +0200 Subject: [PATCH 2/2] Revert config fixes for parallel builds with MSVC This reverts commit 1454f42a2737fd476531a1476653f16ffcf7bb9f. This reverts commit 4aee25e8e2f911c08c8ebaf4245abd54d70bd84c. --- configure/os/CONFIG.win32-x86.win32-x86 | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index f92856205..c3b780c3e 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -140,20 +140,6 @@ STATIC_LDLIBS_NO= STATIC_LDFLAGS= RANLIB= -# -# option needed for parallel builds with Visual Studio 2013 onward -# VS2012 and above have VisualStudioVersion, so just need to exclude 2012 (11.0) -# -FS Force Synchronous PDB Writes -# -ifneq ($(VisualStudioVersion),) -ifneq ($(VisualStudioVersion),11.0) - OPT_CXXFLAGS_NO += -FS - OPT_CFLAGS_NO += -FS -endif -endif - - -# # add -profile here to run the ms profiler # -LTCG whole program optimization # -incremental:no full linking