diff options
| author | Volker Weißmann <volker.weissmann@gmx.de> | 2023-04-24 15:26:54 +0200 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-04-26 14:51:10 -0400 |
| commit | 38b35eca3009a391d4f92b88ff09ab383c79c1f2 (patch) | |
| tree | dc1eba10f622e89dae9cb7f00b25326783363e65 /mesonbuild/modules | |
| parent | bf44120a4f272652f98c607bd05065e8a0492d3a (diff) | |
| download | meson-38b35eca3009a391d4f92b88ff09ab383c79c1f2.tar.gz | |
Add env kwarg to gnome.generate_gir().
Fixes #384
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 7c7e41d61..7d471e4ce 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -32,7 +32,7 @@ from .. import mesonlib from .. import mlog from ..build import CustomTarget, CustomTargetIndex, Executable, GeneratedList, InvalidArguments from ..dependencies import Dependency, PkgConfigDependency, InternalDependency -from ..interpreter.type_checking import DEPENDS_KW, DEPEND_FILES_KW, INSTALL_DIR_KW, INSTALL_KW, NoneType, SOURCES_KW, in_set_validator +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 from ..interpreterbase.decorators import typed_pos_args @@ -982,6 +982,7 @@ class GnomeModule(ExtensionModule): # 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], ' ') + run_env.merge(kwargs['env']) return GirTarget( girfile, @@ -1026,6 +1027,7 @@ class GnomeModule(ExtensionModule): install_dir=[install_dir], install_tag=['typelib'], build_by_default=kwargs['build_by_default'], + env=kwargs['env'], ) @staticmethod @@ -1098,6 +1100,7 @@ class GnomeModule(ExtensionModule): INSTALL_KW, _BUILD_BY_DEFAULT.evolve(since='0.40.0'), _EXTRA_ARGS_KW, + ENV_KW.evolve(since='1.2.0'), KwargInfo('dependencies', ContainerTypeInfo(list, Dependency), default=[], listify=True), KwargInfo('export_packages', ContainerTypeInfo(list, str), default=[], listify=True), KwargInfo('fatal_warnings', bool, default=False, since='0.55.0'), |