diff options
| author | pal1000 <liviuprodea@yahoo.com> | 2020-04-24 17:06:01 +0300 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-05-08 14:09:09 +0000 |
| commit | 772b15ad3227e08bb4e18932ac9ecf4c29271160 (patch) | |
| tree | 92a2a0585ecf667b009c5b8f89b3bf901ec52a98 | |
| parent | 696bafac40f5f15ae140a2e844fb1b31d4918ebe (diff) | |
util: Make process_test path compatible with mingw native toolchains
v2: Make sure we require winepath when using mingw crosscompilers
v3: Also take into account mingw clang toolchains
Acked-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Fixes: f8f14130 ("util/u_process: add util_get_process_exec_path")
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2788
CC: "20.1" <mesa-stable@lists.freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4731>
| -rw-r--r-- | src/util/meson.build | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/util/meson.build b/src/util/meson.build index 2851c0c9880..7ea125e5ac8 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -287,10 +287,13 @@ if with_tests dependencies : idep_mesautil, c_args : [c_msvc_compat_args], ) - if (host_machine.system() == 'windows' and cc.get_id() == 'gcc') - # This conversion is only required on mingw + if (host_machine.system() == 'windows' and build_machine.system() != 'windows') + # This conversion is only required on mingw crosscompilers, otherwise we hit at least one of these issues + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/2690 + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/2788 + prog_winepath = find_program('winepath') process_test_exe_full_path = run_command( - 'winepath', '-w', process_test_exe.full_path() + prog_winepath, '-w', process_test_exe.full_path() ).stdout().strip() else process_test_exe_full_path = process_test_exe.full_path() |