Merge branch 'meson-add-check' into 'main'

meson.build: Check the exit-status-code of `run_command()`

See merge request World/Phosh/squeekboard!663
This commit is contained in:
Marge Bot
2024-08-16 12:41:35 +00:00

View File

@ -88,8 +88,8 @@ message('\n'.join(summary))
# 'rust-analyzer' does not work correctly, when the paths in 'Cargo.toml' have '@path@' in them.
cp = find_program('cp')
sed = find_program('sed')
copy_cargo_toml = run_command('cp', 'Cargo.toml', 'meson_Cargo.toml.in')
prepare_cargo_toml = run_command('sed', '-i', 's/path = "/path = "@path@\//', 'meson_Cargo.toml.in')
copy_cargo_toml = run_command('cp', 'Cargo.toml', 'meson_Cargo.toml.in', check: true)
prepare_cargo_toml = run_command('sed', '-i', 's/path = "/path = "@path@\//', 'meson_Cargo.toml.in', check: true)
path_data = configuration_data()
path_data.set('path', meson.source_root())