mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 19:21:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: fix use of deprecated meson api meson.has_exe_wrapper()

Browse source 
Use meson.can_run_host_binaries() instead.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1183>
This commit is contained in:
Tim-Philipp Müller 2021-10-18 16:51:37 +01:00 committed by GStreamer Marge Bot
parent 8dfab0b08c
commit c5bc0bd7c4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -389,7 +389,7 @@ devenv_cmd = [setenv, '--builddir=@0@'.format(meson.project_build_root()),
'--srcdir=@0@'.format(meson.project_source_root())] '--srcdir=@0@'.format(meson.project_source_root())]
subdir('tests') subdir('tests')
if meson.has_exe_wrapper() and build_machine.system() == 'linux' and host_machine.system() == 'windows' if meson.can_run_host_binaries() and build_machine.system() == 'linux' and host_machine.system() == 'windows'
# FIXME: Ideally we could get the wrapper directly from meson # FIXME: Ideally we could get the wrapper directly from meson
devenv_cmd += ['--wine', host_machine.cpu_family() == 'x86_64' ? 'wine64' : 'wine32'] devenv_cmd += ['--wine', host_machine.cpu_family() == 'x86_64' ? 'wine64' : 'wine32']
sysroot = meson.get_cross_property('sys_root') sysroot = meson.get_cross_property('sys_root')