From ed6a5abee853ed5e4d8c1826b17a0dc29843cd6a Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Fri, 9 Jun 2017 12:58:32 +0530
Subject: [PATCH] find_library: link_args is always a list

---
 mesonbuild/compilers.py         | 2 +-
 mesonbuild/dependencies/base.py | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py
index c9cfb4641..977b7c442 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 00a14bed7..6fbf8bad7 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: