From 020610cfbe55870e9ca3c8206328112b95e0ec4e Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 24 Jul 2023 19:34:19 -0700 Subject: 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 --- mesonbuild/modules/pkgconfig.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesonbuild') 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: -- cgit v1.1