mirror of https://gitlab.com/ita1024/waf.git
Merge pull request #1670 from MoSal/fix_1fbac66
c_config: Fix regression in exec_cfg() introduced in 1fbac66
This commit is contained in:
commit
d368dee436
|
@ -342,13 +342,13 @@ def exec_cfg(self, kw):
|
||||||
|
|
||||||
# retrieving variables of a module
|
# retrieving variables of a module
|
||||||
if 'variables' in kw:
|
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())
|
uselib = kw.get('uselib_store', kw['package'].upper())
|
||||||
vars = Utils.to_list(kw['variables'])
|
vars = Utils.to_list(kw['variables'])
|
||||||
for v in vars:
|
for v in vars:
|
||||||
val = self.cmd_and_log(lst + ['--variable=' + v], env=env).strip()
|
val = self.cmd_and_log(lst + ['--variable=' + v], env=env).strip()
|
||||||
var = '%s_%s' % (uselib, v)
|
var = '%s_%s' % (uselib, v)
|
||||||
v[var] = val
|
v_env[var] = val
|
||||||
if not 'okmsg' in kw:
|
if not 'okmsg' in kw:
|
||||||
kw['okmsg'] = 'yes'
|
kw['okmsg'] = 'yes'
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in New Issue