diff options
| author | Jan Janssen <medhefgo@web.de> | 2023-08-10 18:11:25 +0200 |
|---|---|---|
| committer | Jan Janssen <medhefgo@web.de> | 2023-08-23 14:57:49 +0200 |
| commit | 7f9a0d6d74588c70af87683cd5d7c21b51c782b8 (patch) | |
| tree | d9f921d9e35ff90611fe03b2868f2026e4100c05 /tools | |
| parent | meson: Convert more options to meson features (diff) | |
| download | systemd-7f9a0d6d74588c70af87683cd5d7c21b51c782b8.tar.xz systemd-7f9a0d6d74588c70af87683cd5d7c21b51c782b8.zip | |
meson: Drop skip-deps option
Now that we use meson feature options for our dependencies, we can just
rely on '--auto-features=disabled' to do the same. One benefit of this
is that specific features can still be force-enabled by overriding it
with the appropriate '-Dfeature=enabled' flag.
The two remaining uses for skip-deps can simply rely on their default
logic that sets the value to 'no' when the dependency is disabled.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/oss-fuzz.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh index 419805de7a..df3d39eba6 100755 --- a/tools/oss-fuzz.sh +++ b/tools/oss-fuzz.sh @@ -27,10 +27,12 @@ build="$WORK/build" rm -rf "$build" mkdir -p "$build" +meson_args=("-Db_lundef=false") + if [ -z "$FUZZING_ENGINE" ]; then - fuzzflag="llvm-fuzz=true" + meson_args+=("-Dllvm-fuzz=true") else - fuzzflag="oss-fuzz=true" + meson_args+=("-Doss-fuzz=true" "--auto-features=disabled") apt-get update apt-get install -y gperf m4 gettext python3-pip \ @@ -67,7 +69,7 @@ else fi fi -if ! meson setup "$build" "-D$fuzzflag" -Db_lundef=false; then +if ! meson setup "$build" "${meson_args[@]}"; then cat "$build/meson-logs/meson-log.txt" exit 1 fi |