dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

not sure how this ever worked, but it's LIBPATH that needs to be modified and LIB in the OS environment

Browse source 
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
This commit is contained in:
kichik 2012-10-15 02:34:25 +00:00
parent 7cc150c464
commit cc12f76610
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
SCons/Config/ms
View file

@ -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)