fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 22:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util: Make process_test path compatible with mingw native toolchains

Browse source 
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>
This commit is contained in:
pal1000 2020-04-24 17:06:01 +03:00 • committed by Marge Bot
parent 696bafac40
commit 772b15ad32
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/util/meson.build
View file

@ -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()