Mesa (staging/20.1): util: Make process_test path compatible with mingw native toolchains

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 38f1cf4335dd23fc14a77eca73b2515c9b9ac39d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=38f1cf4335dd23fc14a77eca73b2515c9b9ac39d

Author: pal1000 <liviuprodea at yahoo.com>
Date:   Fri Apr 24 17:06:01 2020 +0300

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 at vmware.com>
Reviewed-by: Daniel Stone <daniels at 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 at lists.freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4731>
(cherry picked from commit 772b15ad3227e08bb4e18932ac9ecf4c29271160)

---

 .pick_status.json    | 2 +-
 src/util/meson.build | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 008e4271f78..829c4a7b4d5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
         "description": "util: Make process_test path compatible with mingw native toolchains",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "f8f1413070ae079443ab31a75679cfd10cb756ed"
     },
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()