From 76f1531f5f900b2a327dab2e29f6a1c19be460f0 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 10 Aug 2019 18:28:04 +0200 Subject: [PATCH] contrib/oss-fuzz/build.sh: fix for i386 build of jbigkit, and use $LIB_FUZZING_ENGINE --- contrib/oss-fuzz/build.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/contrib/oss-fuzz/build.sh b/contrib/oss-fuzz/build.sh index ccac210c..fe6bd340 100755 --- a/contrib/oss-fuzz/build.sh +++ b/contrib/oss-fuzz/build.sh @@ -37,7 +37,14 @@ popd # Build libjbig pushd "$SRC/jbigkit" -make lib +if [ "$ARCHITECTURE" = "i386" ]; then + echo "#!/bin/bash" > gcc + echo "clang -m32 \$*" >> gcc + chmod +x gcc + PATH=$PWD:$PATH make lib +else + make lib +fi mv "$SRC"/jbigkit/libjbig/*.a "$WORK/lib/" mv "$SRC"/jbigkit/libjbig/*.h "$WORK/include/" popd @@ -48,7 +55,7 @@ make install $CXX $CXXFLAGS -std=c++11 -I$WORK/include \ $SRC/libtiff/contrib/oss-fuzz/tiff_read_rgba_fuzzer.cc -o $OUT/tiff_read_rgba_fuzzer \ - -lFuzzingEngine $WORK/lib/libtiffxx.a $WORK/lib/libtiff.a $WORK/lib/libz.a $WORK/lib/libjpeg.a \ + $LIB_FUZZING_ENGINE $WORK/lib/libtiffxx.a $WORK/lib/libtiff.a $WORK/lib/libz.a $WORK/lib/libjpeg.a \ $WORK/lib/libjbig.a $WORK/lib/libjbig85.a mkdir afl_testcases