diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-02 00:04:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 00:04:18 +0300 |
| commit | 357b34f9154ee3aae50d06d32ea6c4e0e152558c (patch) | |
| tree | 038a74b6a7c1a3d79204214d16840f5035af929d /mesonbuild/dependencies/dev.py | |
| parent | 893d101fff01d72e8df055491d8e609eb0fd8575 (diff) | |
| parent | bb0e18b73885de374f8461c0e4f3c911fded1e46 (diff) | |
| download | meson-357b34f9154ee3aae50d06d32ea6c4e0e152558c.zip meson-357b34f9154ee3aae50d06d32ea6c4e0e152558c.tar.gz meson-357b34f9154ee3aae50d06d32ea6c4e0e152558c.tar.bz2 | |
Merge pull request #2375 from centricular/gnome-gir-fixes
Fix GNOME gir generation with lists of dependency lists
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')) |