diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2023-03-05 14:38:57 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2023-06-26 13:10:25 -0400 |
| commit | 418063cc472aa12aca9253c3970486ca5a90b70e (patch) | |
| tree | e72d3f4b57c777c5d32206bcc52609d7c6eeecea /mesonbuild/msetup.py | |
| parent | 620bdf5895131f9e58da4c980a28dc96986d0b57 (diff) | |
| download | meson-418063cc472aa12aca9253c3970486ca5a90b70e.tar.gz | |
pkgconfig: move uninstalled devenv handling from setup to the module hook
msetup.py doesn't need to know the gory details of PkgConfigDependency,
or directly import it at program startup. It's also slightly wasteful to
generate a devenv for the -uninstalled directory when a project doesn't
even, in the end, use the pkgconfig module anyway.
Diffstat (limited to 'mesonbuild/msetup.py')
| -rw-r--r-- | mesonbuild/msetup.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index edc633077..e7bf3c2a1 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -19,8 +19,7 @@ from pathlib import Path import typing as T from . import build, coredata, environment, interpreter, mesonlib, mintro, mlog -from .dependencies import PkgConfigDependency -from .mesonlib import MachineChoice, MesonException +from .mesonlib import MesonException git_ignore_file = '''# This file is autogenerated by Meson. If you change or delete it, it won't be recreated. * @@ -301,7 +300,6 @@ class MesonApp: def finalize_postconf_hooks(self, b: build.Build, intr: interpreter.Interpreter) -> None: b.devenv.append(intr.backend.get_devenv()) - b.devenv.append(PkgConfigDependency.get_env(intr.environment, MachineChoice.HOST, uninstalled=True)) for mod in intr.modules.values(): mod.postconf_hook(b) |