From 7f02f8a386f37a24507a0dfd7e51bf69466951a0 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Sat, 28 Mar 2020 15:51:49 +0100 Subject: [PATCH] Exclude VS2012 from -FS option (cherry picked from 7.0 / commit 4aee25e8 and e29a53f0) --- configure/os/CONFIG.win32-x86.win32-x86 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index 7d6c11b6b..6a5078d60 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -141,13 +141,16 @@ STATIC_LDFLAGS= RANLIB= # -# option needed for parallel builds with Visual Studio 2015 onward -# +# 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 #