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

Avoid a clash when scons is run in parallel operation (#3295528)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6151 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
f0rt 2011-05-02 19:32:12 +00:00
parent 1730185509
commit b39f193c31
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
SCons/utils.py
View file

@ -28,12 +28,15 @@ def AddZLib(env, platform, alias='install-utils'):
print 'Please specify folder of zlib for Win32 via ZLIB_W32' print 'Please specify folder of zlib for Win32 via ZLIB_W32'
Exit(1) Exit(1)
conf = env.Configure() # Avoid unnecessary configuring when cleaning targets
if not conf.CheckLibWithHeader(zlib, 'zlib.h', 'c'): # and a clash when scons is run in parallel operation.
print 'zlib (%s) is missing!' % (platform) if not env.GetOption('clean'):
Exit(1) conf = env.Configure()
if not conf.CheckLibWithHeader(zlib, 'zlib.h', 'c'):
print 'zlib (%s) is missing!' % (platform)
Exit(1)
env = conf.Finish() env = conf.Finish()
def GetAvailableLibs(env, libs): def GetAvailableLibs(env, libs):