Mesa (staging/21.2): meson: dont use missing dumpbin path

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 149473db821ec8e571dfae3c9b2fcf441b41d4f6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=149473db821ec8e571dfae3c9b2fcf441b41d4f6

Author: Michel Zou <xantares09 at hotmail.com>
Date:   Fri Jul 30 13:25:26 2021 +0200

meson: dont use missing dumpbin path

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Cc: 21.2 mesa-stable
Closes #5142

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12139>
(cherry picked from commit 80160a67ab1700aabfcc0aa2c58b0fc73fdbd925)

---

 .pick_status.json | 2 +-
 meson.build       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index bbc10db2537..2305225dbe4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -256,7 +256,7 @@
         "description": "meson: dont use missing dumpbin path",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/meson.build b/meson.build
index 9009048cbfb..45c5a9a6d6b 100644
--- a/meson.build
+++ b/meson.build
@@ -2107,7 +2107,9 @@ pkg = import('pkgconfig')
 if host_machine.system() == 'windows'
   prog_dumpbin = find_program('dumpbin', required : false)
   with_symbols_check = prog_dumpbin.found() and with_tests
-  symbols_check_args = ['--dumpbin', prog_dumpbin.path()]
+  if with_symbols_check
+    symbols_check_args = ['--dumpbin', prog_dumpbin.path()]
+  endif
 else
   prog_nm = find_program('nm')
   with_symbols_check = with_tests