[Mesa-dev] [PATCH 29/48] meson: don't look for nm binary on windows

[Eric Engestrom]

On Monday, 2018-06-11 15:55:56 -0700, Dylan Baker wrote:
> ---
>  meson.build                 | 5 ++++-
>  src/mapi/es1api/meson.build | 2 +-
>  src/mapi/es2api/meson.build | 2 +-
>  3 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index f3e9676f8bf..abe45e933ba 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1468,8 +1468,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
>  
>  subdir('include')
>  subdir('bin')
> diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
> index dcf0aa57492..448cf1c73d2 100644
> --- a/src/mapi/es1api/meson.build
> +++ b/src/mapi/es1api/meson.build
> @@ -59,7 +59,7 @@ pkg.generate(
>    libraries_private : gl_priv_libs,
>  )
>  
> -if with_tests
> +if with_tests and prog_nm.found()

All the *-symbols-check (egl & gbm right now) use `nm` as well, and need
this check added there too.

(reminds me that I need to ping people on my *-symbols-check series)

>    test(
>      'es1-ABI-check',
>      find_program('ABI-check'),
> diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
> index abd633fbb6b..cb6a70a2e90 100644
> --- a/src/mapi/es2api/meson.build
> +++ b/src/mapi/es2api/meson.build
> @@ -59,7 +59,7 @@ pkg.generate(
>    libraries_private : gl_priv_libs,
>  )
>  
> -if with_tests
> +if with_tests and prog_nm.found()
>    test(
>      'es2-ABI-check',
>      find_program('ABI-check'),
> -- 
> 2.17.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev