diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-04-03 17:57:00 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-04-04 22:18:14 +0300 |
| commit | 737fde65fa0ab25bffa69f77261f467fa3167cdf (patch) | |
| tree | 52acd4bd1c29f6601627dfac5a7be3d0a9cafc2c /mesonbuild/interpreter.py | |
| parent | 6841672eb5e9bbf354e19fb83c695eb476130fb6 (diff) | |
| download | meson-737fde65fa0ab25bffa69f77261f467fa3167cdf.zip meson-737fde65fa0ab25bffa69f77261f467fa3167cdf.tar.gz meson-737fde65fa0ab25bffa69f77261f467fa3167cdf.tar.bz2 | |
Bring back the old manual search to cc.find_library.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index ef6f3c1..90a0a13 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -761,13 +761,13 @@ class CompilerHolder(InterpreterObject): required = kwargs.get('required', True) if not isinstance(required, bool): raise InterpreterException('required must be boolean.') - search_dirs = kwargs.get('dirs', []) + search_dirs = mesonlib.stringlistify(kwargs.get('dirs', [])) for i in search_dirs: if not os.path.isabs(i): raise InvalidCode('Search directory %s is not an absolute path.' % i) linkargs = self.compiler.find_library(libname, search_dirs) if required and linkargs is None: - raise InterpreterException('Library %s not found'.format(libname)) + raise InterpreterException('Library {} not found'.format(libname)) lib = dependencies.ExternalLibrary(libname, linkargs) return ExternalLibraryHolder(lib) |