Skip to content

Commit

Permalink
meson: we cannot call get_compiler('cpp') if we didn't "add" it
Browse files Browse the repository at this point in the history
Follow-up for f6d783a.
  • Loading branch information
keszybz authored and poettering committed Oct 9, 2018
1 parent 1371109 commit 1b2acaa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,9 @@ cxx = find_program('c++', required : false)
if cxx.found()
# Used only for tests
add_languages('cpp')
cpp_cmd = ' '.join(meson.get_compiler('cpp').cmd_array())
else
cpp_cmd = ''
endif

want_ossfuzz = get_option('oss-fuzz')
Expand Down
2 changes: 1 addition & 1 deletion test/fuzz/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ sanitize_address = custom_target(
'fuzzers',
'-Db_lundef=false -Db_sanitize=address',
' '.join(cc.cmd_array()),
' '.join(meson.get_compiler('cpp').cmd_array())])
cpp_cmd])

sanitizers = [['address', sanitize_address]]

Expand Down

0 comments on commit 1b2acaa

Please sign in to comment.