From 698503f5a72b24d923bc8a9b9fa6fb0bb8d7f0e4 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 19 Oct 2022 09:22:21 +0530 Subject: [PATCH] meson: Use run_command check: true for windows binary subprojects Fixes a warning about using the check kwarg Part-of: --- subprojects/win-flex-bison-binaries/meson.build | 6 +----- subprojects/win-nasm/meson.build | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/subprojects/win-flex-bison-binaries/meson.build b/subprojects/win-flex-bison-binaries/meson.build index 7b088886a2..f43f39a241 100644 --- a/subprojects/win-flex-bison-binaries/meson.build +++ b/subprojects/win-flex-bison-binaries/meson.build @@ -6,11 +6,7 @@ message('Downloading and extracting win-flex-bison binaries...') zip_hash = '8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135' -ret = run_command(py3, files('download-binary.py'), meson.project_version(), zip_hash) -if ret.returncode() != 0 - message(ret.stdout()) - error(ret.stderr()) -endif +ret = run_command(py3, files('download-binary.py'), meson.project_version(), zip_hash, check: true) meson.override_find_program('flex', find_program('win_flex')) meson.override_find_program('bison', find_program('win_bison')) diff --git a/subprojects/win-nasm/meson.build b/subprojects/win-nasm/meson.build index c5c9000a2d..ee3bfb87ff 100644 --- a/subprojects/win-nasm/meson.build +++ b/subprojects/win-nasm/meson.build @@ -15,10 +15,6 @@ else zip_hash = '2b8a00d9fa348e7b68bac0497e25be44db83c64d6681478fdcbfa03fca36ad76' endif -ret = run_command(py3, files('download-binary.py'), meson.project_version(), arch, zip_hash) -if ret.returncode() != 0 - message(ret.stdout()) - error(ret.stderr()) -endif +ret = run_command(py3, files('download-binary.py'), meson.project_version(), arch, zip_hash, check: true) meson.override_find_program('nasm', find_program(join_paths('nasm-@0@'.format(meson.project_version()), 'nasm')))