waflib: subproject: carefully restore previous enviroment in configuration context

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

View File

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