From bf44120a4f272652f98c607bd05065e8a0492d3a Mon Sep 17 00:00:00 2001 From: Volker Weißmann Date: Mon, 24 Apr 2023 14:47:45 +0200 Subject: Set the CC environment variable for g-ir-scanner. Fixes #1035 --- mesonbuild/modules/gnome.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index d749c2666..7c7e41d61 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -37,7 +37,7 @@ from ..interpreterbase import noPosargs, noKwargs, FeatureNew, FeatureDeprecated from ..interpreterbase import typed_kwargs, KwargInfo, ContainerTypeInfo from ..interpreterbase.decorators import typed_pos_args from ..mesonlib import ( - MachineChoice, MesonException, OrderedSet, Popen_safe, join_args, + MachineChoice, MesonException, OrderedSet, Popen_safe, join_args, quote_arg ) from ..programs import OverrideProgram from ..scripts.gettext import read_linguas @@ -979,6 +979,9 @@ class GnomeModule(ExtensionModule): # settings user could have set in machine file, like PKG_CONFIG_LIBDIR, # SYSROOT, etc. run_env = PkgConfigDependency.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], ' ') return GirTarget( girfile, -- cgit v1.2.3