shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

meson: use cross compilation compatible c++ check

Browse Source
This commit is contained in:
James Hilliard 2018-12-27 09:16:20 +08:00 committed by Yu Watanabe
parent 8eab766804
commit 46e63a2a3e
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -287,10 +287,8 @@ want_tests = get_option('tests')
slow_tests = want_tests != 'false' and get_option('slow-tests')
install_tests = get_option('install-tests')
cxx = find_program('c++', required : fuzzer_build)
if cxx.found()
if add_languages('cpp', required : fuzzer_build)
# Used only for tests
add_languages('cpp')
cxx_cmd = ' '.join(meson.get_compiler('cpp').cmd_array())
else
cxx_cmd = ''

3
src/systemd/meson.build
View File

@ -52,8 +52,7 @@ if cc.has_argument('-std=iso9899:2017')
opts += [['c', '-std=iso9899:2017']]
endif
cxx = find_program('c++', required : false)
if cxx.found()
if add_languages('cpp', required : false)
opts += [['c++'],
['c++', '-std=c++98'],
['c++', '-std=c++11']]

2
src/test/meson.build
View File

@ -957,7 +957,7 @@ tests += [
]
if cxx.found()
if cxx_cmd != ''
tests += [
[['src/libsystemd/sd-bus/test-bus-vtable-cc.cc'],
[],