summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-08-10 18:45:16 +0200
committerEven Rouault <even.rouault@spatialys.com>2019-08-10 18:45:16 +0200
commit75c1cf5e917be0b15db5f0135571db98671a766d (patch)
tree4b73566768ba8090cd7ce1cceeb4f0eb2f939fd2
parenta7fa3410d9416b0d92b57e19618c7e9d1eb5c4bf (diff)
parent76f1531f5f900b2a327dab2e29f6a1c19be460f0 (diff)
downloadlibtiff-git-75c1cf5e917be0b15db5f0135571db98671a766d.tar.gz
Merge branch 'ossfuzz_i386'
-rwxr-xr-xcontrib/oss-fuzz/build.sh11
1 files 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