diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-03-02 11:11:17 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-03-05 09:31:29 -0800 |
| commit | a8293dd59c0a22817f2336df8ae97dce1232f72a (patch) | |
| tree | 123b316ad1bf34c52f75c29d05e8b94ab05d52be /mesonbuild/modules/pkgconfig.py | |
| parent | 1a82880730e2d9f58eaa67179aa40c6976835278 (diff) | |
| download | meson-a8293dd59c0a22817f2336df8ae97dce1232f72a.zip meson-a8293dd59c0a22817f2336df8ae97dce1232f72a.tar.gz meson-a8293dd59c0a22817f2336df8ae97dce1232f72a.tar.bz2 | |
mesonlib: Replace unholder argument to listify
listify shouldn't be unholdering, it's a function to turn scalar values
into lists, or flatten lists. Having a separate function is clearer,
easier to understand, and can be run recursively if necessary.
Diffstat (limited to 'mesonbuild/modules/pkgconfig.py')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 8de88c9..1d8e8a9 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -74,7 +74,7 @@ class DependenciesHelper: def _process_reqs(self, reqs): '''Returns string names of requirements''' processed_reqs = [] - for obj in mesonlib.listify(reqs, unholder=True): + for obj in mesonlib.unholder(mesonlib.listify(reqs)): if not isinstance(obj, str): FeatureNew('pkgconfig.generate requirement from non-string object', '0.46.0').use(self.state.subproject) if hasattr(obj, 'generated_pc'): @@ -108,7 +108,7 @@ class DependenciesHelper: self.cflags += mesonlib.stringlistify(cflags) def _process_libs(self, libs, public): - libs = mesonlib.listify(libs, unholder=True) + libs = mesonlib.unholder(mesonlib.listify(libs)) processed_libs = [] processed_reqs = [] processed_cflags = [] |