From e1d65c21501215c07c4b36ecf1fa9b6ffef0b5e9 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 13 Oct 2005 13:33:28 +0000
Subject: [PATCH] don't add /GX to defenv

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4326 212acab6-be3b-0410-9dea-997c60f758d6
---
 SCons/Config/ms | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SCons/Config/ms b/SCons/Config/ms
index cce1da83..c35edca5 100644
--- a/SCons/Config/ms
+++ b/SCons/Config/ms
@@ -25,7 +25,8 @@ if defenv['DEBUG']:
 # if stl usage causes link failure, copy the good libcp.lib
 # from one of the other lib folders and use it instead.
 
-conf = defenv.Configure()
+confenv = defenv.Copy()
+conf = confenv.Configure()
 
 libcptest = """
 #include <fstream>
@@ -50,6 +51,7 @@ if not conf.TryLink(libcptest % 'no change', '.cpp'):
 			libcp = r'%s\libcp.lib' % libdir
 			shutil.copy(libcp, Dir('#/.sconf_temp').abspath)
 			if conf.TryLink(libcptest % (r'using %s' % libcp), '.cpp'):
+				defenv.PrependENVPath('LIB', Dir('#/.sconf_temp').abspath)
 				break
 		except IOError:
 			continue