diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-09 12:58:32 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-09 20:21:01 +0530 |
| commit | ed6a5abee853ed5e4d8c1826b17a0dc29843cd6a (patch) | |
| tree | c1afa8a20ff77ae28329206a98f677bb802eaa93 | |
| parent | 627190faf39781dba197fab0849adff208a5bb96 (diff) | |
| download | meson-ed6a5abee853ed5e4d8c1826b17a0dc29843cd6a.zip meson-ed6a5abee853ed5e4d8c1826b17a0dc29843cd6a.tar.gz meson-ed6a5abee853ed5e4d8c1826b17a0dc29843cd6a.tar.bz2 | |
find_library: link_args is always a list
| -rw-r--r-- | mesonbuild/compilers.py | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/base.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index c9cfb46..977b7c4 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -1773,7 +1773,7 @@ class ValaCompiler(Compiler): for d in extra_dirs: vapi = os.path.join(d, libname + '.vapi') if os.path.isfile(vapi): - return vapi + return [vapi] mlog.debug('Searched {!r} and {!r} wasn\'t found'.format(extra_dirs, libname)) return None diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 00a14be..6fbf8ba 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -510,8 +510,6 @@ class ExternalLibrary(ExternalDependency): self.is_found = False if link_args: self.is_found = True - if not isinstance(link_args, list): - link_args = [link_args] self.link_args = link_args if not silent: if self.is_found: |