diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-27 00:27:52 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-27 00:57:40 -0400 |
| commit | 0881b78bbabb5aab59b2abedf41b05d46c3f6e4d (patch) | |
| tree | f6bd95e748c21aa5c0d1fb8963eea2aa2772ba4a /gir | |
| parent | 137952c03abd2acd454b834d8cc7ae10915c8aa0 (diff) | |
| download | gobject-introspection-0881b78bbabb5aab59b2abedf41b05d46c3f6e4d.tar.gz | |
Don't override finding executables when using pre-built tools.
Actually, we shouldn't really need this. We are building `native: false`
binaries so when we look up a `native: true` binary the override should
not apply. I've fixed this upstream in meson in
https://github.com/NixOS/nixpkgs/pull/86080, though some backwards
compatibility migration might be in order.
In the meantime, we can make `gi_cross_use_host_gi` prevent the
overrides from happening, which will achieve the desired behavior.
Finally, this allows us to use `find_program` in `scanner_command`,
unconditionally, letting the presence of the override dictate whether a
freshly-built or pre-built `g-ir-scanner` is used.
Diffstat (limited to 'gir')
| -rw-r--r-- | gir/meson.build | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/gir/meson.build b/gir/meson.build index 04f9371a..b37fdb81 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -41,24 +41,14 @@ gir_files = [ typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') install_data(gir_files, install_dir: girdir) -if get_option('gi_cross_use_host_gi') - scanner_command = [ - 'g-ir-scanner', - ] -else - scanner_command = [ - python, - girscanner, - ] -endif - -scanner_command += [ - '--output=@OUTPUT@', - '--no-libtool', - '--quiet', - '--reparse-validate', - '--add-include-path', join_paths(meson.current_build_dir()), - '--add-include-path', join_paths(meson.current_source_dir()), +scanner_command = [ + find_program('g-ir-scanner', native: true), + '--output=@OUTPUT@', + '--no-libtool', + '--quiet', + '--reparse-validate', + '--add-include-path', join_paths(meson.current_build_dir()), + '--add-include-path', join_paths(meson.current_source_dir()), ] dep_type = glib_dep.type_name() |