mirror of https://gitlab.com/ita1024/waf.git
fix for missing package name argument for 'pkg-config' call during fetching custom variables
Signed-off-by: young <young@yang.(none)>
This commit is contained in:
parent
6f6c284bec
commit
bc9cd753d4
|
@ -303,6 +303,16 @@ def exec_cfg(self, kw):
|
|||
for key, val in defi.items():
|
||||
lst.append('--define-variable=%s=%s' % (key, val))
|
||||
|
||||
static = False
|
||||
if 'args' in kw:
|
||||
args = Utils.to_list(kw['args'])
|
||||
if '--static' in args or '--static-libs' in args:
|
||||
static = True
|
||||
lst += args
|
||||
|
||||
# tools like pkgconf expect the package argument after the -- ones -_-
|
||||
lst.extend(Utils.to_list(kw['package']))
|
||||
|
||||
# retrieving variables of a module
|
||||
if 'variables' in kw:
|
||||
env = kw.get('env', self.env)
|
||||
|
@ -316,16 +326,6 @@ def exec_cfg(self, kw):
|
|||
kw['okmsg'] = 'yes'
|
||||
return
|
||||
|
||||
static = False
|
||||
if 'args' in kw:
|
||||
args = Utils.to_list(kw['args'])
|
||||
if '--static' in args or '--static-libs' in args:
|
||||
static = True
|
||||
lst += args
|
||||
|
||||
# tools like pkgconf expect the package argument after the -- ones -_-
|
||||
lst.extend(Utils.to_list(kw['package']))
|
||||
|
||||
# so we assume the command-line will output flags to be parsed afterwards
|
||||
ret = self.cmd_and_log(lst)
|
||||
if not 'okmsg' in kw:
|
||||
|
|
Loading…
Reference in New Issue