diff options
| author | LaserEyess <lasereyess@users.noreply.github.com> | 2022-01-17 09:34:23 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2022-01-18 13:49:19 +0000 |
| commit | 4cb4660c7cf1d9836e7877c9a58f13b92d90f4fa (patch) | |
| tree | aac34e73763682f299c1bdef05c574909aaf408d | |
| parent | 22b0bac28e6c51651dedc7c270fc009309f2cb6b (diff) | |
| download | mpv-4cb4660c7cf1d9836e7877c9a58f13b92d90f4fa.tar.bz2 mpv-4cb4660c7cf1d9836e7877c9a58f13b92d90f4fa.tar.xz | |
meson: add check kwarg to run_command() calls
Warning from meson:
WARNING: You should add the boolean check kwarg to the run_command call.
It currently defaults to false,
but it will default to true in future releases of meson.
See also: https://github.com/mesonbuild/meson/issues/9300
All of the run_command() calls currently use need to succeed for the
build to work properly.
| -rw-r--r-- | meson.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 45709fdf53..159ec0bd4a 100644 --- a/meson.build +++ b/meson.build @@ -1523,7 +1523,7 @@ macos_sdk_version_py = find_program(join_paths(source_root, 'TOOLS', 'macos-sdk-version.py')) macos_sdk_info = ['', '0.0'] if darwin - macos_sdk_info = run_command(macos_sdk_version_py).stdout().split(',') + macos_sdk_info = run_command(macos_sdk_version_py, check: true).stdout().split(',') endif macos_sdk_path = macos_sdk_info[0].strip() @@ -1557,8 +1557,8 @@ macos_10_14_features = get_option('macos-10-14-features').require( xcrun = find_program('xcrun', required: get_option('swift-build')) swift_ver = '0.0' if xcrun.found() - swift_prog = find_program(run_command(xcrun, '-find', 'swift').stdout().strip()) - swift_ver_string = run_command(swift_prog, '-version').stdout() + swift_prog = find_program(run_command(xcrun, '-find', 'swift', check: true).stdout().strip()) + swift_ver_string = run_command(swift_prog, '-version', check: true).stdout() verRe = ''' #!/usr/bin/env python3 import re @@ -1567,7 +1567,7 @@ verRe = re.compile("(?i)version\s?([\d.]+)") swift_ver = verRe.search(sys.argv[1]).group(1) sys.stdout.write(swift_ver) ''' - swift_ver = run_command(python, '-c', verRe, swift_ver_string).stdout() + swift_ver = run_command(python, '-c', verRe, swift_ver_string, check: true).stdout() message('Detected Swift version: ' + swift_ver) endif @@ -1695,7 +1695,7 @@ features.sort() features_str = " ".join(features) sys.stdout.write(features_str) ''' -feature_str = run_command(python, '-c', feature_sort, features).stdout() +feature_str = run_command(python, '-c', feature_sort, features, check: true).stdout() # Set config.h conf_data = configuration_data() |