From 6ba034c37d8004a72d392f37f66e709c593d8983 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 26 Feb 2020 05:51:28 -0800 Subject: [PATCH] mesonbuild/modules/gnome.py: Fix giscanner and gicompiler logic Currently, giscanner and the gicompiler paths are only scanned via pkg-config if they are first found in the host path. Add a else statement to fix this oversite. --- mesonbuild/modules/gnome.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 0ea4b273e..1743b59c9 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -754,12 +754,16 @@ class GnomeModule(ExtensionModule): giscanner_path = giscanner.get_command()[0] if not any(x in giscanner_path for x in gi_util_dirs_check): giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) + else: + giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) gicompiler = self.interpreter.find_program_impl('g-ir-compiler') if gicompiler.found(): gicompiler_path = gicompiler.get_command()[0] if not any(x in gicompiler_path for x in gi_util_dirs_check): gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) + else: + gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) ns = kwargs.pop('namespace') nsversion = kwargs.pop('nsversion')