follow the latest version of clang

diff --git a/build_harnesses.sh b/build_harnesses.sh
index 54dc9ff88cf78bef852e9eaef531e216f26400f8..8b79657bd2b10ce3e6ba14e2995bad985a79510f 100755 (executable)
--- a/build_harnesses.sh
+++ b/build_harnesses.sh
@@ -4,18 +4,15 @@ make clean
 autoreconf -vfi
 
 # build the library with ASAN
-#NO_LINK="-fsanitize=fuzzer-no-link"
-NO_LINK=""
-./configure CC=clang LD=clang CFLAGS="-g -fsanitize=address -fno-omit-frame-pointer $NO_LINK" LDFLAGS="-g -fsanitize=address -fno-omit-frame-pointer $NO_LINK"
+./configure CC=clang LD=clang CFLAGS="-g -fsanitize=address -fno-omit-frame-pointer" LDFLAGS="-g -fsanitize=address -fno-omit-frame-pointer"
 make -j4
 
 OUT=`pwd`/fuzzers
 mkdir -p $OUT
-LIBFUZZER_FLAGS="-fsanitize=fuzzer,address -fno-omit-frame-pointer"
-#LIBS="src/.libs/libonig.a"
-LIBS="src/.libs/libonig.a /usr/local/lib/libLLVMFuzzerMain.a"
+LIBS="src/.libs/libonig.a"
 
-CFLAGS="-Isrc -g $LIBFUZZER_FLAGS"
+CFLAGS="-Isrc -g -fsanitize=fuzzer,address -fno-omit-frame-pointer"
+CFLAGS_M="-Isrc -g -fsanitize=fuzzer-no-link,address -fno-omit-frame-pointer"
 
 # Libfuzzer builds
 clang++ contributed/libfuzzer-onig.cpp $LIBS $CFLAGS -o $OUT/libfuzzer-onig
@@ -25,7 +22,8 @@ clang harnesses/deluxe-encode-harness.c $LIBS $CFLAGS -o $OUT/deluxe-encode-libf
 
 clang -DUTF16_BE harnesses/encode-harness.c $LIBS $CFLAGS -o $OUT/utf16-be-libfuzzer
 clang -DUTF16_LE harnesses/encode-harness.c $LIBS $CFLAGS -o $OUT/utf16-le-libfuzzer
-clang -DWITH_READ_MAIN harnesses/encode-harness.c src/.libs/libonig.a $CFLAGS -o $OUT/main-encode
-clang -DWITH_READ_MAIN -DUTF16_LE harnesses/encode-harness.c src/.libs/libonig.a $CFLAGS -o $OUT/main-utf16-le
-clang -DWITH_READ_MAIN -DUTF16_BE harnesses/encode-harness.c src/.libs/libonig.a $CFLAGS -o $OUT/main-utf16-be
-clang -DWITH_READ_MAIN harnesses/deluxe-encode-harness.c $LIBS $CFLAGS -o $OUT/main-deluxe-encode
+
+clang -DWITH_READ_MAIN harnesses/encode-harness.c src/.libs/libonig.a $CFLAGS_M -o $OUT/main-encode
+clang -DWITH_READ_MAIN -DUTF16_LE harnesses/encode-harness.c src/.libs/libonig.a $CFLAGS_M -o $OUT/main-utf16-le
+clang -DWITH_READ_MAIN -DUTF16_BE harnesses/encode-harness.c src/.libs/libonig.a $CFLAGS_M -o $OUT/main-utf16-be
+clang -DWITH_READ_MAIN harnesses/deluxe-encode-harness.c $LIBS $CFLAGS_M -o $OUT/main-deluxe-encode