aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2025-02-02 23:53:57 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2025-02-02 23:53:57 +0000
commit5ac3e5d7d9174f1411fc9c3001a08ac95af9808c (patch)
tree35fe369a50b2a7250519f01f4cc7fd3a9b75e325
parentc32a8a1ccaae8490142e67e078336a95c5ffc956 (diff)
parent8d86fd7114f613955d1d8d082ae3add5618c6fc9 (diff)
downloadslirp-5ac3e5d7d9174f1411fc9c3001a08ac95af9808c.zip
slirp-5ac3e5d7d9174f1411fc9c3001a08ac95af9808c.tar.gz
slirp-5ac3e5d7d9174f1411fc9c3001a08ac95af9808c.tar.bz2
Merge branch 'meson' into 'master'
Fix Meson warnings See merge request slirp/libslirp!149
-rw-r--r--meson.build2
-rw-r--r--meson_options.txt8
2 files changed, 5 insertions, 5 deletions
diff --git a/meson.build b/meson.build
index b565b81..c5c0e7f 100644
--- a/meson.build
+++ b/meson.build
@@ -29,7 +29,7 @@ if fuzzer_build and fuzz_reproduce
endif
cc = meson.get_compiler('c')
-add_languages('cpp', required : fuzzer_build)
+add_languages('cpp', required : fuzzer_build, native : false)
glib_static = get_option('static')
diff --git a/meson_options.txt b/meson_options.txt
index 5eafd38..72d8b71 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,16 +1,16 @@
option('version_suffix', type: 'string', value: '',
description: 'Suffix to append to SLIRP_VERSION_STRING')
-option('oss-fuzz', type : 'boolean', value : 'false',
+option('oss-fuzz', type : 'boolean', value : false,
description : 'build against oss-fuzz')
-option('llvm-fuzz', type : 'boolean', value : 'false',
+option('llvm-fuzz', type : 'boolean', value : false,
description : 'build against LLVM libFuzzer')
-option('fuzz-reproduce', type : 'boolean', value : 'false',
+option('fuzz-reproduce', type : 'boolean', value : false,
description : 'build a standalone executable to reproduce fuzz cases')
-option('static', type : 'boolean', value : 'false',
+option('static', type : 'boolean', value : false,
description : 'build static binary, only for debugging, otherwise rather use --default-library static')
option('target_winver', type : 'string', value: '',