diff options
| author | Allan McRae <allan@archlinux.org> | 2022-03-06 14:51:00 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2022-03-06 14:53:42 +1000 |
| commit | 0a792843f9dce87d3f574aa61227f75c14f0bab4 (patch) | |
| tree | 84897350e508cd38f36cc85f1ceca6f7a0644c7c | |
| parent | e1ce2351f5c00dd90104e0f4ce3bf176da28af08 (diff) | |
Silence meson run_command warning
Upsteam is warning about future change in the run_command check
argument. Ref: https://github.com/mesonbuild/meson/issues/9300
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | meson.build | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 76b9d2aa..78663ff3 100644 --- a/meson.build +++ b/meson.build @@ -33,7 +33,7 @@ MESON_MAKE_SYMLINK = join_paths(meson.source_root(), 'build-aux/meson-make-symli BASH = find_program('bash4', 'bash') if BASH.found() - bash_version = run_command(BASH, '-c', 'IFS=.; echo "${BASH_VERSINFO[*]:0:3}"').stdout() + bash_version = run_command(BASH, '-c', 'IFS=.; echo "${BASH_VERSINFO[*]:0:3}"', check: true).stdout() have_bash = bash_version.version_compare('>= 4.4.0') endif @@ -53,7 +53,8 @@ if get_option('use-git-version') find_program('git'), 'describe', '--abbrev=4', - '--dirty').stdout().strip().strip('v') + '--dirty', + check: true).stdout().strip().strip('v') else PACKAGE_VERSION = meson.project_version() endif @@ -230,7 +231,7 @@ strip_static = '--strip-debug' file_seccomp = get_option('file-seccomp') # meson-git has find_program('file', required: false, version: '>=5.38') -filever = run_command('sh', '-c', 'file --version | sed -n "s/^file-\(.*\)/\\1/p"').stdout() +filever = run_command('sh', '-c', 'file --version | sed -n "s/^file-\(.*\)/\\1/p"', check: true).stdout() if file_seccomp.enabled() or ( file_seccomp.auto() and filever.version_compare('>= 5.38') ) filecmd = 'file -S' endif @@ -245,7 +246,7 @@ elif os.contains('bsd') or os == 'dragonfly' inodecmd = 'stat -f \'%i %N\'' endif -chost = run_command(cc, '-dumpmachine').stdout().strip() +chost = run_command(cc, '-dumpmachine', check: true).stdout().strip() carch = chost.split('-')[0] # annoyingly, we have to maintain two sets of configuration_data which is |