From ff9bf223c24143260a975f45963eb90f40565c57 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 17 May 2018 13:44:30 -0700 Subject: meson: make nm binary optional This makes nm not required, but used if found. In general I imagine that this means that on windows nm wont be found, and on other platforms it will. v2: - fix gbm and egl symbols check tests to only be run if nm is found - reword commit message to reflect the code change Reviewed-by: Eric Anholt --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 87ce5f7872e..f72bdc946bf 100644 --- a/meson.build +++ b/meson.build @@ -1502,8 +1502,11 @@ endif pkg = import('pkgconfig') +prog_nm = find_program('nm', required : false) env_test = environment() -env_test.set('NM', find_program('nm').path()) +if prog_nm.found() + env_test.set('NM', prog_nm.path()) +endif # This quirk needs to be applied to sources with functions defined in assembly # as GCC LTO drops them. See: https://bugs.freedesktop.org/show_bug.cgi?id=109391 -- cgit v1.2.3