diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2023-07-24 19:34:19 -0700 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-07-25 00:13:16 -0400 |
| commit | 020610cfbe55870e9ca3c8206328112b95e0ec4e (patch) | |
| tree | 8066e57ae75bd8bd611f51c992935ad75a24fb56 /mesonbuild | |
| parent | dd578decdb473a9e46c266567077ba114ec36272 (diff) | |
| download | meson-020610cfbe55870e9ca3c8206328112b95e0ec4e.zip meson-020610cfbe55870e9ca3c8206328112b95e0ec4e.tar.gz meson-020610cfbe55870e9ca3c8206328112b95e0ec4e.tar.bz2 | |
modules/pkgconfig: Don't insert None into devenv list
When the pkgconfig module is imported, but not used, it will insert None
on the end of the devenv list. This list is not expected to contain
None, and causes Meson to crash. This can happen in complex build setups
(reported from mesa), where pkgconfig is only used in some
configurations
Fixes: #12032
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index c6bc42d..dd2efad 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -391,7 +391,8 @@ class PkgConfigModule(NewExtensionModule): }) def postconf_hook(self, b: build.Build) -> None: - b.devenv.append(self.devenv) + if self.devenv is not None: + b.devenv.append(self.devenv) def _get_lname(self, l: T.Union[build.SharedLibrary, build.StaticLibrary, build.CustomTarget, build.CustomTargetIndex], msg: str, pcfile: str) -> str: |