oss-fuzz: cleanup build flags

Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>

diff --git a/src/tests/oss-fuzz.sh b/src/tests/oss-fuzz.sh
index fb3701c829c44b7a721b566aa45ee071af737aaa..665facdcd40f0950e54ba9ea1365fc1f1a50d2a1 100755 (executable)
--- a/src/tests/oss-fuzz.sh
+++ b/src/tests/oss-fuzz.sh
@@ -2,28 +2,25 @@
 
 set -ex
 
-export SANITIZER=${SANITIZER:-address}
-flags="-O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
-coverage_flags="-fsanitize=fuzzer-no-link"
-
-sanitizer_flags="-fsanitize=address -fsanitize-address-use-after-scope"
-if [[ "$SANITIZER" == "undefined" ]]; then
-    sanitizer_flags="-fsanitize=undefined"
-elif [[ "$SANITIZER" == "memory" ]]; then
-    sanitizer_flags="-fsanitize=memory -fsanitize-memory-track-origins"
-fi
+export LC_CTYPE=C.UTF-8
 
 export CC=${CC:-clang}
-export CFLAGS=${CFLAGS:-$flags $sanitizer_flags $coverage_flags}
-
 export CXX=${CXX:-clang++}
-export CXXFLAGS=${CXXFLAGS:-$flags $sanitizer_flags $coverage_flags}
+clang_version="$($CC --version | sed -nr 's/.*version ([^ ]+?) .*/\1/p' | sed -r 's/-$//')"
+
+SANITIZER=${SANITIZER:-address -fsanitize-address-use-after-scope}
+flags="-O1 -fno-omit-frame-pointer -g -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=$SANITIZER"
+
+clang_lib="/usr/lib64/clang/${clang_version}/lib/linux"
+[ -d "$clang_lib" ] || clang_lib="/usr/lib/clang/${clang_version}/lib/linux"
+
+export CFLAGS=${CFLAGS:-$flags}
+export CXXFLAGS=${CXXFLAGS:-$flags}
+export LDFLAGS=${LDFLAGS:--L${clang_lib}}
 
 export OUT=${OUT:-$(pwd)/out}
 mkdir -p $OUT
 
-export LIB_FUZZING_ENGINE=${LIB_FUZZING_ENGINE:--fsanitize=fuzzer}
-
 apt-get update -qq
 apt-get install --yes --no-install-recommends \
     build-essential docbook2x doxygen git \