From 3f635bc84bab96a7eb97d1c75a0cb75013c28ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Thu, 20 Jan 2022 01:01:47 +0100 Subject: [PATCH] meson: Move to the new run_command() API --- meson.build | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 4213637..0c9c280 100644 --- a/meson.build +++ b/meson.build @@ -54,18 +54,14 @@ if python_incdir == '' endif result = run_command(python, '-c', - 'import sys; sys.stdout.write("%d.%d" % (sys.version_info[0], sys.version_info[1]))') - if result.returncode() != 0 - error('Unable to detect Python version: ' + result.stdout() + result.stderr()) - endif + 'import sys; sys.stdout.write("%d.%d" % (sys.version_info[0], sys.version_info[1]))', + check: true) python_version = result.stdout() python_name = 'python' + python_version result = run_command(python, '-c', - 'from distutils import sysconfig; import sys; sys.stdout.write(sysconfig.get_python_inc())') - if result.returncode() != 0 - error('Unable to detect Python include directory: ' + result.stdout() + result.stderr()) - endif + 'from distutils import sysconfig; import sys; sys.stdout.write(sysconfig.get_python_inc())', + check: true) python_incdir = result.stdout() else py_major_v = cc.get_define('PY_MAJOR_VERSION',