Merge branch 'cross-postinstall' into 'master'

meson: Don't execute post-install.py if cross compiling See merge request GNOME/gtk!1636
2020-04-06 23:59:33 +00:00 · 2020-04-06 23:59:33 +00:00 · baeae71d12
commit baeae71d12
parent f8be3229b1 531766fe64
1 changed files with 9 additions and 5 deletions
--- a/meson.build
+++ b/meson.build
@ -797,11 +797,15 @@ subdir('docs/tools')
 subdir('docs/reference')

 # Keep this in sync with post-install.sh expected arguments
-meson.add_install_script('build-aux/meson/post-install.py',
-                         gtk_api_version,
-                         gtk_binary_version,
-                         gtk_libdir,
-                         gtk_datadir)
+if not meson.is_cross_build()
+  meson.add_install_script('build-aux/meson/post-install.py',
+                           gtk_api_version,
+                           gtk_binary_version,
+                           gtk_libdir,
+                           gtk_datadir)
+else
+  message('Not executing post-install steps automatically when cross compiling')
+endif

 if host_machine.system() != 'windows'
  # Install Valgrind suppression files (except on Windows,