From 3f71779f8a94a448b490401432db5aa47f306662 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 30 Jul 2021 21:27:50 -0400 Subject: Fix python module leaving PKG_CONFIG_LIBDIR set in os.environ. --- mesonbuild/modules/python.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'mesonbuild/modules/python.py') diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 450991b1c..f38becf05 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -247,10 +247,13 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', try: return PythonPkgConfigDependency(name, env, kwargs, installation) finally: - if old_pkg_libdir is not None: - os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir - if old_pkg_path is not None: - os.environ['PKG_CONFIG_PATH'] = old_pkg_path + def set_env(name, value): + if value is not None: + os.environ[name] = value + elif name in os.environ: + del os.environ[name] + set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir) + set_env('PKG_CONFIG_PATH', old_pkg_path) candidates.extend([ functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation), -- cgit v1.2.3