diff options
| author | Corentin Noël <corentin@elementary.io> | 2017-10-03 20:26:16 +0200 |
|---|---|---|
| committer | Corentin Noël <corentin@elementary.io> | 2017-10-03 20:26:16 +0200 |
| commit | 1320a98a33e4e9f188e5daa143316b24d0dce819 (patch) | |
| tree | 82ea281b163115277e1c9524283b0d371b6c21ac /mesonbuild/dependencies/dev.py | |
| parent | f13887b64a9d535682668960493158ae15bfbb2d (diff) | |
| parent | 0c3d58baba4a61558ed9b4905f26155a3e95cf6c (diff) | |
| download | meson-1320a98a33e4e9f188e5daa143316b24d0dce819.zip meson-1320a98a33e4e9f188e5daa143316b24d0dce819.tar.gz meson-1320a98a33e4e9f188e5daa143316b24d0dce819.tar.bz2 | |
Merge github.com:mesonbuild/meson into vala-target-dirs
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index d2dd107..387300a 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -21,7 +21,7 @@ import shutil from .. import mlog from .. import mesonlib -from ..mesonlib import version_compare, Popen_safe +from ..mesonlib import version_compare, Popen_safe, stringlistify, extract_as_list from .base import DependencyException, ExternalDependency, PkgConfigDependency class GTestDependency(ExternalDependency): @@ -185,7 +185,7 @@ class LLVMDependency(ExternalDependency): raise DependencyException('Could not generate modules for LLVM.') self.modules = shlex.split(out) - modules = mesonlib.stringlistify(mesonlib.flatten(kwargs.get('modules', []))) + modules = stringlistify(extract_as_list(kwargs, 'modules')) for mod in sorted(set(modules)): if mod not in self.modules: mlog.log('LLVM module', mod, 'found:', mlog.red('NO')) |