From: Jan Janssen <medhefgo@web.de>
Date: Mon, 2 May 2022 08:55:53 +0000 (+0200)
Subject: meson: Remove check-compilation.sh
X-Git-Tag: v251-rc2~8^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=911c15087ccf2886a5a10e030511c97b07cd8fbd;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/meson.build b/meson.build
index 582e33c9a73..ef532e421f6 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 9302d6ca2e0..ea73f92af57 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 c2fe3aa5c16..00000000000
--- 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