From cc12f7661069a85892e7560cd3a76dea0e47f2c6 Mon Sep 17 00:00:00 2001 From: kichik Date: Mon, 15 Oct 2012 02:34:25 +0000 Subject: [PATCH] not sure how this ever worked, but it's LIBPATH that needs to be modified and LIB in the OS environment maybe older versions of scons read LIB after environment construction too? git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6270 212acab6-be3b-0410-9dea-997c60f758d6 --- SCons/Config/ms | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SCons/Config/ms b/SCons/Config/ms index 389a1cb2..37aba2ce 100644 --- a/SCons/Config/ms +++ b/SCons/Config/ms @@ -78,15 +78,16 @@ if float(defenv['MSVS_VERSION'].replace('Exp','')) < 8.0: } """ - conf.env.PrependENVPath('LIB', Dir('#/.sconf_temp').abspath) + conf.env.Prepend(LIBPATH = Dir('#/.sconf_temp').abspath) conf.env.Append(CCFLAGS = ['$EXCEPTION_FLAG']) if not conf.TryLink(libcptest % 'no change', '.cpp'): import os, shutil - libdirs = defenv['ENV']['LIB'].split(os.pathsep) + libdirs = (defenv['ENV']['LIB']).split(os.pathsep) + defenv['LIBPATH'] for libdir in libdirs: + libdir = confenv.subst(libdir) try: libcp = r'%s\libcp.lib' % libdir shutil.copy(libcp, Dir('#/.sconf_temp').abspath)