meson: use cross compilation compatible c++ check

jameshilliard · yuwata · commit 46e63a2a3ed4 · 2018-12-28T12:17:06.000+09:00
diff --git a/meson.build b/meson.build
@@ -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 = ''
diff --git a/src/systemd/meson.build b/src/systemd/meson.build
@@ -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']]
diff --git a/src/test/meson.build b/src/test/meson.build
@@ -957,7 +957,7 @@ tests += [
 
 ]
 
-if cxx.found()
+if cxx_cmd != ''
         tests += [
                 [['src/libsystemd/sd-bus/test-bus-vtable-cc.cc'],
                  [],

Original file line number	Diff line number	Diff line change
`@@ -957,7 +957,7 @@ tests += [`
`957`	`957`
`958`	`958`	`]`
`959`	`959`
`960`		`-if cxx.found()`
	`960`	`+if cxx_cmd != ''`
`961`	`961`	`tests += [`
`962`	`962`	`[['src/libsystemd/sd-bus/test-bus-vtable-cc.cc'],`
`963`	`963`	`[],`