From 772b15ad3227e08bb4e18932ac9ecf4c29271160 Mon Sep 17 00:00:00 2001 From: pal1000 Date: Fri, 24 Apr 2020 17:06:01 +0300 Subject: [PATCH] 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 Reviewed-by: Daniel Stone Fixes: f8f14130 ("util/u_process: add util_get_process_exec_path") Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2788 CC: "20.1" Part-of: --- src/util/meson.build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/util/meson.build b/src/util/meson.build index 2851c0c..7ea125e 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() -- 2.7.4