diff options
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 3 | ||||
| -rw-r--r-- | test cases/unit/90 devenv/meson.build | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index c6bc42d09..dd2efad73 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: diff --git a/test cases/unit/90 devenv/meson.build b/test cases/unit/90 devenv/meson.build index 72d8fdc33..316b20c62 100644 --- a/test cases/unit/90 devenv/meson.build +++ b/test cases/unit/90 devenv/meson.build @@ -20,3 +20,6 @@ env = environment({'TEST_C': ['/prefix']}, method: 'prepend') meson.add_devenv(env) env = environment({'TEST_C': ['/suffix']}, method: 'append') meson.add_devenv(env) + +# Reproducer for https://github.com/mesonbuild/meson/issues/12032 +pkgconf = import('pkgconfig') |