2 files changed, 62 insertions, 14 deletions
diff --git a/fuzz/atom/parser/meson.build b/fuzz/atom/parser/meson.build
index 88452f5..025c6fb 100644
--- a/fuzz/atom/parser/meson.build
+++ b/fuzz/atom/parser/meson.build
@@ -1,7 +1,31 @@
-fuzzers += {
-    'atom_parser': {
-        'gencorpus': meson.current_source_dir() / 'gencorpus.rs',
-        'fuzzer': meson.current_source_dir() / 'fuzz.rs',
-        'deps': [mon],
-    },
-}
+gencorpus = executable(
+    'gencorpus',
+    'gencorpus.rs',
+    dependencies: [mon],
+    link_with: [gentoo_utils],
+)
+
+corpus = custom_target(
+    'corpus',
+    output: 'corpus',
+    command: [gencorpus, 'corpus'],
+)
+
+fuzz_rs = static_library(
+    'fuzzer',
+    'fuzz.rs',
+    rust_abi: 'c',
+    rust_args: [
+        '-Cpasses=sancov-module',
+        '-Cllvm-args=-sanitizer-coverage-level=3',
+        '-Cllvm-args=-sanitizer-coverage-inline-8bit-counters',
+    ],
+    dependencies: [mon],
+    link_with: [gentoo_utils],
+)
+
+fuzz = executable(
+    'fuzzer',
+    link_args: ['-fsanitize=fuzzer'],
+    link_with: [fuzz_rs],
+)
diff --git a/fuzz/atom/vercmp/meson.build b/fuzz/atom/vercmp/meson.build
index 5634061..025c6fb 100644
--- a/fuzz/atom/vercmp/meson.build
+++ b/fuzz/atom/vercmp/meson.build
@@ -1,7 +1,31 @@
-fuzzers += {
-    'atom_vercmp': {
-        'gencorpus': meson.current_source_dir() / 'gencorpus.rs',
-        'fuzzer': meson.current_source_dir() / 'fuzz.rs',
-        'deps': [mon],
-    },
-}
+gencorpus = executable(
+    'gencorpus',
+    'gencorpus.rs',
+    dependencies: [mon],
+    link_with: [gentoo_utils],
+)
+
+corpus = custom_target(
+    'corpus',
+    output: 'corpus',
+    command: [gencorpus, 'corpus'],
+)
+
+fuzz_rs = static_library(
+    'fuzzer',
+    'fuzz.rs',
+    rust_abi: 'c',
+    rust_args: [
+        '-Cpasses=sancov-module',
+        '-Cllvm-args=-sanitizer-coverage-level=3',
+        '-Cllvm-args=-sanitizer-coverage-inline-8bit-counters',
+    ],
+    dependencies: [mon],
+    link_with: [gentoo_utils],
+)
+
+fuzz = executable(
+    'fuzzer',
+    link_args: ['-fsanitize=fuzzer'],
+    link_with: [fuzz_rs],
+)