Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/videolan/dav1d.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanne Grunau <janne-vlc@jannau.net>2020-02-17 02:38:54 +0300
committerJean-Baptiste Kempf <jb@videolan.org>2020-02-25 12:26:26 +0300
commitd398da88c0b68e3dbb966256c7ed682b211579e3 (patch)
treeb051158ce36183ef47fef362ae852ebf6b80c012 /tests/libfuzzer
parent7675eb16b9b2d8c2fc46879f3d28bd095fd03065 (diff)
fuzzing: link the fuzzing binaries as C++
Requires meson 0.51 for oss-fuzz and 0.49 for the fuzzing binaries in general due to the use of the 'kwargs' keyword argument.
Diffstat (limited to 'tests/libfuzzer')
-rw-r--r--tests/libfuzzer/meson.build9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/libfuzzer/meson.build b/tests/libfuzzer/meson.build
index 07f84e3..3b82911 100644
--- a/tests/libfuzzer/meson.build
+++ b/tests/libfuzzer/meson.build
@@ -28,6 +28,7 @@
dav1d_fuzzer_sources = files('dav1d_fuzzer.c')
fuzzer_ldflags = []
+fuzzer_link_lang = {}
if get_option('fuzzer_ldflags') != ''
fuzzer_ldflags += [get_option('fuzzer_ldflags')]
@@ -38,8 +39,9 @@ if fuzzing_engine == 'none'
elif fuzzing_engine == 'libfuzzer'
fuzzer_ldflags += ['-fsanitize=fuzzer']
elif fuzzing_engine == 'oss-fuzz'
- # libFuzzingEngine needs libc++
- fuzzer_ldflags += ['-lc++']
+ # libFuzzingEngine needs c++
+ add_languages('cpp')
+ fuzzer_link_lang = {'link_language': 'cpp'}
endif
dav1d_fuzzer = executable('dav1d_fuzzer',
@@ -50,6 +52,7 @@ dav1d_fuzzer = executable('dav1d_fuzzer',
link_with : libdav1d,
build_by_default: true,
dependencies : [thread_dependency],
+ kwargs: fuzzer_link_lang
)
dav1d_fuzzer_mt = executable('dav1d_fuzzer_mt',
@@ -60,6 +63,7 @@ dav1d_fuzzer_mt = executable('dav1d_fuzzer_mt',
link_with : libdav1d,
build_by_default: true,
dependencies : [thread_dependency],
+ kwargs: fuzzer_link_lang
)
objcopy = find_program('objcopy',
@@ -89,5 +93,6 @@ if (objcopy.found() and
link_depends: libdav1d_af,
build_by_default: false,
dependencies : [thread_dependency],
+ kwargs: fuzzer_link_lang
)
endif