diff options
| author | Přemysl Eric Janouch <p@janouch.name> | 2023-06-22 01:48:02 +0200 |
|---|---|---|
| committer | Přemysl Eric Janouch <p@janouch.name> | 2023-06-22 04:06:38 +0200 |
| commit | 86622e0c311a80bb26666688b88b8c5d853119e5 (patch) | |
| tree | 85a1ab3e57b126262bb340be2efea4999c36905f /meson.build | |
| parent | a4772ce3194484c56595a8f5e9c0535fd86254fd (diff) | |
| download | fiv-86622e0c311a80bb26666688b88b8c5d853119e5.tar.gz fiv-86622e0c311a80bb26666688b88b8c5d853119e5.tar.xz fiv-86622e0c311a80bb26666688b88b8c5d853119e5.zip | |
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.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 5 |
1 files changed, 3 insertions, 2 deletions
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', |