From 92235e0c48f6d23f51c63a847f987eb23b885f5a Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 21 Dec 2022 09:30:44 -0800 Subject: [PATCH] meson: replace has_exe_wrapper with can_run_host_binaries The former is a deprecated alias for the latter, which more accurately describes what the function does. Reviewed-by: Jesse Natalie Acked-by: Alyssa Rosenzweig Part-of: --- meson.build | 2 +- src/compiler/glsl/glcpp/meson.build | 5 +---- src/compiler/glsl/tests/meson.build | 5 +---- src/gallium/targets/opencl/meson.build | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 3a9d8fb9a69..911cc066c03 100644 --- a/meson.build +++ b/meson.build @@ -543,7 +543,7 @@ endforeach if not have_mtls_dialect # need .run to check libc support. meson aborts when calling .run when # cross-compiling, but because this is just an optimization we can skip it - if meson.is_cross_build() and not meson.has_exe_wrapper() + if meson.is_cross_build() and not meson.can_run_host_binaries() warning('cannot auto-detect -mtls-dialect when cross-compiling, using compiler default') else # -fpic to force dynamic tls, otherwise TLS relaxation defeats check diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build index ae60fbba1f1..c91d9a1c23e 100644 --- a/src/compiler/glsl/glcpp/meson.build +++ b/src/compiler/glsl/glcpp/meson.build @@ -80,10 +80,7 @@ glcpp = executable( ) # Meson can't auto-skip these on cross builds because of the python wrapper -# -# TODO: has_exe_wrapper() is deprecated and renamed to can_run_host_binaries() -# starting with Meson 0.55.0 -if with_any_opengl and with_tests and meson.has_exe_wrapper() and \ +if with_any_opengl and with_tests and meson.can_run_host_binaries() and \ with_glcpp_tests modes = ['unix', 'windows', 'oldmac', 'bizarro'] diff --git a/src/compiler/glsl/tests/meson.build b/src/compiler/glsl/tests/meson.build index 2204f0478dc..a883356795b 100644 --- a/src/compiler/glsl/tests/meson.build +++ b/src/compiler/glsl/tests/meson.build @@ -66,10 +66,7 @@ test( ) # Meson can't auto-skip these on cross builds because of the python wrapper -# -# TODO: has_exe_wrapper() is deprecated and renamed to can_run_host_binaries() -# starting with Meson 0.55.0 -if meson.has_exe_wrapper() +if meson.can_run_host_binaries() test( 'glsl compiler warnings', prog_python, diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build index db3586bd7fb..96e83f23c77 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build @@ -50,7 +50,7 @@ clang_test_code = ''' return found_pos == ::std::string::npos ? 1 : 0; } ''' -can_check_clang = (not meson.is_cross_build() or meson.has_exe_wrapper()) and cpp.has_link_argument(linker_rpath_arg) +can_check_clang = (not meson.is_cross_build() or meson.can_run_host_binaries()) and cpp.has_link_argument(linker_rpath_arg) if can_check_clang test_run = cpp.run(clang_test_code, name : 'dep-clang-usable', dependencies : [dep_llvm, dep_clang], args : linker_rpath_arg)