diff options
| author | Aleksey Filippov <alekseyf@google.com> | 2018-02-24 21:22:04 +0000 |
|---|---|---|
| committer | Aleksey Filippov <alekseyf@google.com> | 2018-02-24 21:22:04 +0000 |
| commit | be6cedb491481b7882133f8533b69443ce9cd469 (patch) | |
| tree | a762fbb1d6286b3d028947ef6bffd8b81f39d8e8 | |
| parent | c88f56959924ea944dc6e344771dfda67af771d7 (diff) | |
| download | meson-be6cedb491481b7882133f8533b69443ce9cd469.zip meson-be6cedb491481b7882133f8533b69443ce9cd469.tar.gz meson-be6cedb491481b7882133f8533b69443ce9cd469.tar.bz2 | |
Use listify(unholder=True) instead of manual unwrapping
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 7c6b3a8..5ff26ec 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -53,13 +53,11 @@ class DependenciesHelper: self.cflags += mesonlib.stringlistify(cflags) def _process_libs(self, libs, public): - libs = mesonlib.listify(libs) + libs = mesonlib.listify(libs, unholder=True) processed_libs = [] processed_reqs = [] processed_cflags = [] for obj in libs: - if hasattr(obj, 'held_object'): - obj = obj.held_object if hasattr(obj, 'pcdep'): pcdeps = mesonlib.listify(obj.pcdep) processed_reqs += [i.name for i in pcdeps] |