diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-08-18 09:56:13 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-09-18 13:51:27 -0400 |
| commit | f1c35b561f80174ae1ea936da282d8736c19e247 (patch) | |
| tree | 81efdf677e76fc32e7531470caf80235fa04d24b /mesonbuild/modules/gnome.py | |
| parent | 6a56f6d98fb7806a59967b0df3ede26544eac4a4 (diff) | |
| download | meson-f1c35b561f80174ae1ea936da282d8736c19e247.tar.gz | |
pkgconfig: Set PKG_CONFIG in env for devenv and g-ir-scanner
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 7de9d46b3..b0bca1590 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -34,7 +34,7 @@ from .. import mesonlib from .. import mlog from ..build import CustomTarget, CustomTargetIndex, Executable, GeneratedList, InvalidArguments from ..dependencies import Dependency, InternalDependency -from ..dependencies.pkgconfig import PkgConfigDependency, PkgConfigCLI +from ..dependencies.pkgconfig import PkgConfigDependency, PkgConfigInterface from ..interpreter.type_checking import DEPENDS_KW, DEPEND_FILES_KW, ENV_KW, INSTALL_DIR_KW, INSTALL_KW, NoneType, SOURCES_KW, in_set_validator from ..interpreterbase import noPosargs, noKwargs, FeatureNew, FeatureDeprecated from ..interpreterbase import typed_kwargs, KwargInfo, ContainerTypeInfo @@ -980,7 +980,7 @@ class GnomeModule(ExtensionModule): # -uninstalled.pc files Meson generated. It also must respect pkgconfig # settings user could have set in machine file, like PKG_CONFIG_LIBDIR, # SYSROOT, etc. - run_env = PkgConfigCLI.get_env(state.environment, MachineChoice.HOST, uninstalled=True) + run_env = PkgConfigInterface.get_env(state.environment, MachineChoice.HOST, uninstalled=True) # g-ir-scanner uses Python's distutils to find the compiler, which uses 'CC' cc_exelist = state.environment.coredata.compilers.host['c'].get_exelist() run_env.set('CC', [quote_arg(x) for x in cc_exelist], ' ') |