diff options
| author | Jan Janssen <medhefgo@web.de> | 2022-05-02 10:55:53 +0200 |
|---|---|---|
| committer | Jan Janssen <medhefgo@web.de> | 2022-05-04 15:59:51 +0200 |
| commit | 911c15087ccf2886a5a10e030511c97b07cd8fbd (patch) | |
| tree | 5eaf2a0cfc5c87cd0e33173ebdb0d1d593bff17c | |
| parent | 3d35c6d47e8c6dab9f1eef738231cce605d0f923 (diff) | |
| download | systemd-911c15087ccf2886a5a10e030511c97b07cd8fbd.tar.gz | |
meson: Remove check-compilation.sh
No need to involve a trivial shell script for this.
We could call the compiler directly, but test() expects arguments
to be passed separately and cc.cmd_array() can contain arguments
itself. Using env is easier than manually slicing the array because
meson has no builtins for that.
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | src/systemd/meson.build | 15 | ||||
| -rwxr-xr-x | tools/check-compilation.sh | 5 |
3 files changed, 9 insertions, 12 deletions
diff --git a/meson.build b/meson.build index 582e33c9a7..ef532e421f 100644 --- a/meson.build +++ b/meson.build @@ -289,7 +289,6 @@ conf.set_quoted('STATUS_UNIT_FORMAT_DEFAULT_STR', status_unit_format cc = meson.get_compiler('c') pkgconfig = import('pkgconfig') -check_compilation_sh = find_program('tools/check-compilation.sh') meson_build_sh = find_program('tools/meson-build.sh') want_tests = get_option('tests') diff --git a/src/systemd/meson.build b/src/systemd/meson.build index 9302d6ca2e..ea73f92af5 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -77,11 +77,14 @@ endif foreach header : _systemd_headers + _not_installed_headers + [libudev_h_path] foreach opt : opts std_name = opt.length() == 2 ? '_'.join(opt[1].split(':')) : '' - name = ''.join(['cc-', header.split('/')[-1], '_', opt[0], std_name]) - test(name, - check_compilation_sh, - args : cc.cmd_array() + ['-c', '-x'] + opt + - ['-Werror', '-include', - meson.current_source_dir() / header]) + test('cc-' + header.split('/')[-1] + '_' + opt[0] + std_name, + env, + args : [cc.cmd_array(), + '-c', + '-x', opt, + '-Werror', + '-include', meson.current_source_dir() / header, + '-o/dev/null', + '/dev/null']) endforeach endforeach diff --git a/tools/check-compilation.sh b/tools/check-compilation.sh deleted file mode 100755 index c2fe3aa5c1..0000000000 --- a/tools/check-compilation.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: LGPL-2.1-or-later -set -eu - -"$@" '-' -o/dev/null </dev/null |