Merge branch 'no-override-g-ir-compiler' into 'main'

build: Only override g-ir-compiler when GIR generation is enabled

See merge request GNOME/glib!3876
This commit is contained in:
Philip Withnall 2024-02-09 20:18:39 +00:00
commit a59499ab0a

View File

@ -24,6 +24,10 @@ gicompilerepository = executable('gi-compile-repository', 'compiler.c',
c_args: custom_c_args,
)
# Replace the default g-ir-compiler target with the version we
# just built.
meson.override_find_program('g-ir-compiler', gicompilerepository)
# Only override the user-installed compiler if we need to generate the GIRs
# GLib, Gio, and GObject...
if enable_gir
# Replace the default g-ir-compiler target with the version we
# just built.
meson.override_find_program('g-ir-compiler', gicompilerepository)
endif