Mesa (master): meson: require `nm` again on Unix systems

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 66dd53584e223f1e83e24349f26c7d9a4812faa3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=66dd53584e223f1e83e24349f26c7d9a4812faa3

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Tue Oct 29 21:43:22 2019 +0000

meson: require `nm` again on Unix systems

This was made optional in ff9bf223c24143260a97 ("meson: make nm binary optional")
for Windows, but proper windows has been added and `nm` is now only used
on Unix systems.

Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviwed-by: Dylan Baker <dylan at pnwbakers>

---

 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 796b628e5eb..457cc0c5fdc 100644
--- a/meson.build
+++ b/meson.build
@@ -1685,8 +1685,8 @@ if host_machine.system() == 'windows'
   with_symbols_check = prog_dumpbin.found() and with_tests
   symbols_check_args = ['--dumpbin', prog_dumpbin.path()]
 else
-  prog_nm = find_program('nm', required : false)
-  with_symbols_check = prog_nm.found() and with_tests
+  prog_nm = find_program('nm')
+  with_symbols_check = with_tests
   symbols_check_args = ['--nm', prog_nm.path()]
 endif