FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-22 18:07:09 +01:00
Code Issues 2 Projects Releases Wiki Activity

waflib: subproject: carefully restore previous enviroment in configuration context

Browse Source
This commit is contained in:
Alibek Omarov 2019-04-11 01:38:00 +03:00
parent eb650b71ad
commit b2038e76d3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/waflib/subproject.py
View File

@ -110,12 +110,14 @@ def add_subproject(ctx, names):
ctx.msg(msg='--X %s' % depth(), result='ignored', color='YELLOW') ctx.msg(msg='--X %s' % depth(), result='ignored', color='YELLOW')
depth_pop() depth_pop()
return return
ctx.setenv(name, ctx.env) # derive new env from saveenv = ctx.env
ctx.setenv(name, ctx.env) # derive new env from previous
ctx.env.ENVNAME = name ctx.env.ENVNAME = name
ctx.msg(msg='--> %s' % depth(), result='in progress', color='BLUE') ctx.msg(msg='--> %s' % depth(), result='in progress', color='BLUE')
ctx.recurse(name) ctx.recurse(name)
ctx.msg(msg='<-- %s' % depth(), result='done', color='BLUE') ctx.msg(msg='<-- %s' % depth(), result='done', color='BLUE')
ctx.setenv('') ctx.setenv('') # save env changes
ctx.env = saveenv # but use previous
depth_pop() depth_pop()
else: else:
if not ctx.all_envs: if not ctx.all_envs: