From 86622e0c311a80bb26666688b88b8c5d853119e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Thu, 22 Jun 2023 01:48:02 +0200 Subject: Make cross-compilation scripts work from MSYS2 This is weird and runs very slowly. Meson can also find libraries outside the subroot, in particular the fast float plugin. --- meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index e1d9e5f..50daf3d 100644 --- a/meson.build +++ b/meson.build @@ -326,10 +326,11 @@ if not win32 meson.add_install_script(updater, skip_if_destdir : dynamic_desktops) endif elif meson.is_cross_build() + # Note that even compiling /from within MSYS2/ can still be a cross-build. msys2_root = meson.get_external_property('msys2_root') - meson.add_install_script('msys2-cross-install.sh', msys2_root) + meson.add_install_script('msys2-install.sh', msys2_root) - # This is the minimum to run targets from msys2-cross-configure.sh builds. + # This is the minimum to run targets from msys2-configure.sh builds. meson.add_devenv({ 'WINEPATH' : msys2_root / 'bin', 'XDG_DATA_DIRS' : msys2_root / 'share', -- cgit v1.2.3