From d0171b0d632893e5574c8f7de2f7582efe18d65b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Thu, 12 Jul 2012 21:55:08 +0200
Subject: Disable incremental link on Windows.


diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 16c05c3..d6d4e29 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -127,10 +127,11 @@ else :
 # This isn't a real flag (yet) AFAIK. Be sure to append it to the CXXFLAGS
 # where you need it
 env["OBJCCFLAGS"] = []
+
 if env["optimize"] :
 	if env["PLATFORM"] == "win32" :
 		env.Append(CCFLAGS = ["/O2", "/GL"])
-		env.Append(LINKFLAGS = ["/INCREMENTAL:NO", "/LTCG"])
+		env.Append(LINKFLAGS = ["/LTCG"])
 	else :
 		env.Append(CCFLAGS = ["-O2"])
 
@@ -210,7 +211,7 @@ if env.get("coverage", 0) :
 if env["PLATFORM"] == "win32" :
 	env.Append(LIBS = ["user32", "crypt32", "dnsapi", "iphlpapi", "ws2_32", "wsock32", "Advapi32"])
 	env.Append(CCFLAGS = ["/EHsc", "/nologo"])
-	# FIXME: We should find a decent solution for MSVS 10
+	env.Append(LINKFLAGS = ["/INCREMENTAL:no"])
 	if int(env["MSVS_VERSION"].split(".")[0]) < 10 :
 		env["LINKCOM"] = [env["LINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1']
 		env["SHLINKCOM"] = [env["SHLINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;2']
-- 
cgit v0.10.2-6-g49f6