diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-06-06 12:10:35 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-08-03 16:27:52 -0400 |
| commit | 183e4b8e903c6c4c057d09549e669d6292478a4e (patch) | |
| tree | 02e0e2306ef78a797d992914c4badd2c34b180ed /mesonbuild/modules/external_project.py | |
| parent | f077cb2ee3fba55fc0e1be327ad791c19f3c3b5e (diff) | |
| download | meson-183e4b8e903c6c4c057d09549e669d6292478a4e.tar.gz | |
PkgConfigDependency: Move CLI handling into its own abstraction
This makes the code cleaner and will allow to have other implementations
in the future.
Diffstat (limited to 'mesonbuild/modules/external_project.py')
| -rw-r--r-- | mesonbuild/modules/external_project.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/modules/external_project.py b/mesonbuild/modules/external_project.py index fd7e7c885..f7a72bced 100644 --- a/mesonbuild/modules/external_project.py +++ b/mesonbuild/modules/external_project.py @@ -24,7 +24,7 @@ from .. import mlog, build from ..compilers.compilers import CFLAGS_MAPPING from ..envconfig import ENV_VAR_PROG_MAP from ..dependencies import InternalDependency -from ..dependencies.pkgconfig import PkgConfigDependency +from ..dependencies.pkgconfig import PkgConfigCLI from ..interpreterbase import FeatureNew from ..interpreter.type_checking import ENV_KW, DEPENDS_KW from ..interpreterbase.decorators import ContainerTypeInfo, KwargInfo, typed_kwargs, typed_pos_args @@ -165,8 +165,8 @@ class ExternalProject(NewExtensionModule): self.run_env['LDFLAGS'] = self._quote_and_join(link_args) self.run_env = self.user_env.get_env(self.run_env) - self.run_env = PkgConfigDependency.setup_env(self.run_env, self.env, MachineChoice.HOST, - uninstalled=True) + self.run_env = PkgConfigCLI.setup_env(self.run_env, self.env, MachineChoice.HOST, + uninstalled=True) self.build_dir.mkdir(parents=True, exist_ok=True) self._run('configure', configure_cmd, workdir) |