Skip to content

Commit 6f0863f

Browse files
authored
Merge pull request systemd#121 from cgzones/meson
Meson tweaks
2 parents 32a93b9 + 21f2de8 commit 6f0863f

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

meson.build

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ conf.set_quoted('PKGSYSCONFDIR', get_option('sysconfdir'))
2525
cc = meson.get_compiler('c')
2626

2727
c_args = '''
28-
-Wextra
2928
-Werror=undef
3029
-Werror=format=2
3130
-Wformat-security
@@ -110,8 +109,7 @@ gperf_test_format = '''
110109
const char * in_word_set(const char *, @0@);
111110
@1@
112111
'''
113-
gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C'
114-
gperf_snippet = run_command('sh', '-c', gperf_snippet_format.format(gperf.path()))
112+
gperf_snippet = run_command('sh', '-c', 'echo foo,bar | "$1" -L ANSI-C', '_', gperf, check: true)
115113
gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout())
116114
if cc.compiles(gperf_test)
117115
gperf_len_type = 'size_t'

0 commit comments

Comments
 (0)