Don't link the fuzzing engine while compiling encoder_list (#1707)

diff --git a/.travis/build_fuzzers.sh b/.travis/build_fuzzers.sh
index 76cf3b35b7db9666d2da4b6f59e4749db915c780..29355acd9e924167e0bf3ec3c3fc50ccdb10ed22 100755 (executable)
--- a/.travis/build_fuzzers.sh
+++ b/.travis/build_fuzzers.sh
@@ -5,9 +5,10 @@ MAGICK_COMPILER_FLAGS="-DBUILD_TRAVIS=1"
 MAGICK_INCLUDE="appdir/usr/include/ImageMagick-7"
 MAGICK_SRC="Magick++/fuzz"
 MAGICK_LIBS="-Lappdir/usr/lib -lz -lpng -lfontconfig -lxcb -lX11 -lXext -lbz2 -ljpeg -ljbig -lIlmImf -ldjvulibre -ltiff -llqr-1 -lwmf -lwmflite -lraqm -lxml2 -llzma -llcms2 -lpthread -lfreetype -lMagick++-7.Q16 -lMagickWand-7.Q16 -lMagickCore-7.Q16 -lstdc++"
+MAGICK_LIBS_NO_FUZZ="$MAGICK_LIBS"
 MAGICK_OUTPUT="Magick++/fuzz"
 MAGICK_FAST_BUILD=1
 
 export LD_LIBRARY_PATH=appdir/usr/lib
 
-. $MAGICK_SRC/build_fuzzers.sh
\ No newline at end of file
+. $MAGICK_SRC/build_fuzzers.sh

diff --git a/Magick++/fuzz/build.sh b/Magick++/fuzz/build.sh
index c5fd9d0d160bd88600866cbd9aad542ae80bcfdd..cf7f233a4f8ba894f0a7f26e1db70c4805de1845 100644 (file)
--- a/Magick++/fuzz/build.sh
+++ b/Magick++/fuzz/build.sh
@@ -102,7 +102,8 @@ MAGICK_COMPILER=$CXX
 MAGICK_COMPILER_FLAGS=$CXXFLAGS
 MAGICK_INCLUDE="$WORK/include/ImageMagick-7"
 MAGICK_SRC="$SRC/imagemagick/Magick++/fuzz"
-MAGICK_LIBS="$LIB_FUZZING_ENGINE $WORK/lib/libMagick++-7.Q16HDRI.a $WORK/lib/libMagickWand-7.Q16HDRI.a $WORK/lib/libMagickCore-7.Q16HDRI.a $WORK/lib/libpng.a $WORK/lib/libtiff.a $WORK/lib/libheif.a $WORK/lib/libde265.a $WORK/lib/libopenjp2.a $WORK/lib/libwebp.a $WORK/lib/libturbojpeg.a $WORK/lib/libjpeg.a $WORK/lib/libfreetype.a $WORK/lib/libraw.a $WORK/lib/liblzma.a $WORK/lib/liblcms2.a $WORK/lib/libz.a"
+MAGICK_LIBS_NO_FUZZ="$WORK/lib/libMagick++-7.Q16HDRI.a $WORK/lib/libMagickWand-7.Q16HDRI.a $WORK/lib/libMagickCore-7.Q16HDRI.a $WORK/lib/libpng.a $WORK/lib/libtiff.a $WORK/lib/libheif.a $WORK/lib/libde265.a $WORK/lib/libopenjp2.a $WORK/lib/libwebp.a $WORK/lib/libturbojpeg.a $WORK/lib/libjpeg.a $WORK/lib/libfreetype.a $WORK/lib/libraw.a $WORK/lib/liblzma.a $WORK/lib/liblcms2.a $WORK/lib/libz.a"
+MAGICK_LIBS="$LIB_FUZZING_ENGINE $MAGICK_LIBS_NO_FUZZ"
 MAGICK_OUTPUT=$OUT
 MAGICK_FAST_BUILD=0
 

diff --git a/Magick++/fuzz/build_fuzzers.sh b/Magick++/fuzz/build_fuzzers.sh
index 87592eb7a2de2a35f5d0ad7b4a9a6994117bab38..aefbeef359a50c7959f153eb12f5bc05cfe6b9ca 100644 (file)
--- a/Magick++/fuzz/build_fuzzers.sh
+++ b/Magick++/fuzz/build_fuzzers.sh
@@ -3,7 +3,7 @@
 MAGICK_COMPILER_FLAGS="$MAGICK_COMPILER_FLAGS -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"
 
 $MAGICK_COMPILER $MAGICK_COMPILER_FLAGS -std=c++11 -I$MAGICK_INCLUDE "$MAGICK_SRC/encoder_list.cc" \
-    -o "$MAGICK_SRC/encoder_list" $MAGICK_LIBS
+    -o "$MAGICK_SRC/encoder_list" $MAGICK_LIBS_NO_FUZZ
 
 for f in $MAGICK_SRC/*_fuzzer.cc; do
     fuzzer=$(basename "$f" _fuzzer.cc)