2
0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-25 19:30:04 +01:00

Merge pull request #1670 from MoSal/fix_1fbac66

c_config: Fix regression in exec_cfg() introduced in 1fbac66
This commit is contained in:
ita1024 2015-12-11 21:06:16 +01:00
commit d368dee436

View File

@ -342,13 +342,13 @@ def exec_cfg(self, kw):
# retrieving variables of a module
if 'variables' in kw:
v = kw.get('env', self.env)
v_env = kw.get('env', self.env)
uselib = kw.get('uselib_store', kw['package'].upper())
vars = Utils.to_list(kw['variables'])
for v in vars:
val = self.cmd_and_log(lst + ['--variable=' + v], env=env).strip()
var = '%s_%s' % (uselib, v)
v[var] = val
v_env[var] = val
if not 'okmsg' in kw:
kw['okmsg'] = 'yes'
return