Sun Feb 28 18:47:42 UTC 2021

config_host.mk.in             |    1 +
 configure.ac                  |    4 ++++
 vcl/Executable_602fuzzer.mk   |    2 +-
 vcl/Executable_bmpfuzzer.mk   |    2 +-
 vcl/Executable_cgmfuzzer.mk   |    2 +-
 vcl/Executable_diffuzzer.mk   |    2 +-
 vcl/Executable_docxfuzzer.mk  |    2 +-
 vcl/Executable_dxffuzzer.mk   |    2 +-
 vcl/Executable_epsfuzzer.mk   |    2 +-
 vcl/Executable_fodpfuzzer.mk  |    2 +-
 vcl/Executable_fodsfuzzer.mk  |    2 +-
 vcl/Executable_fodtfuzzer.mk  |    2 +-
 vcl/Executable_giffuzzer.mk   |    2 +-
 vcl/Executable_htmlfuzzer.mk  |    2 +-
 vcl/Executable_hwpfuzzer.mk   |    2 +-
 vcl/Executable_jpgfuzzer.mk   |    2 +-
 vcl/Executable_lwpfuzzer.mk   |    2 +-
 vcl/Executable_metfuzzer.mk   |    2 +-
 vcl/Executable_mmlfuzzer.mk   |    2 +-
 vcl/Executable_mtpfuzzer.mk   |    2 +-
 vcl/Executable_olefuzzer.mk   |    2 +-
 vcl/Executable_pcdfuzzer.mk   |    2 +-
 vcl/Executable_pctfuzzer.mk   |    2 +-
 vcl/Executable_pcxfuzzer.mk   |    2 +-
 vcl/Executable_pngfuzzer.mk   |    2 +-
 vcl/Executable_ppmfuzzer.mk   |    2 +-
 vcl/Executable_pptfuzzer.mk   |    2 +-
 vcl/Executable_pptxfuzzer.mk  |    2 +-
 vcl/Executable_psdfuzzer.mk   |    2 +-
 vcl/Executable_qpwfuzzer.mk   |    2 +-
 vcl/Executable_rasfuzzer.mk   |    2 +-
 vcl/Executable_rtffuzzer.mk   |    2 +-
 vcl/Executable_scrtffuzzer.mk |    2 +-
 vcl/Executable_sftfuzzer.mk   |    2 +-
 vcl/Executable_slkfuzzer.mk   |    2 +-
 vcl/Executable_svmfuzzer.mk   |    2 +-
 vcl/Executable_tgafuzzer.mk   |    2 +-
 vcl/Executable_tiffuzzer.mk   |    2 +-
 vcl/Executable_wksfuzzer.mk   |    2 +-
 vcl/Executable_wmffuzzer.mk   |    2 +-
 vcl/Executable_ww2fuzzer.mk   |    2 +-
 vcl/Executable_ww6fuzzer.mk   |    2 +-
 vcl/Executable_ww8fuzzer.mk   |    2 +-
 vcl/Executable_xbmfuzzer.mk   |    2 +-
 vcl/Executable_xlsfuzzer.mk   |    2 +-
 vcl/Executable_xlsxfuzzer.mk  |    2 +-
 vcl/Executable_xpmfuzzer.mk   |    2 +-
 47 files changed, 50 insertions(+), 45 deletions(-)

New commits:
commit 44b36a0602b04342566362bce3f6bed7d2b096e4
Author:     Andrzej Hunt <andrzej at ahunt.org>
AuthorDate: Sat Feb 27 14:21:56 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Feb 28 19:46:58 2021 +0100

    Upgrade fuzzers to LIB_FUZZING_ENGINE
    
    And check that LIB_FUZZING_ENGINE is set during configure.
    
    Because:
    1. It's easier to build locally this way (you don't need to build or hack a
       libFuzzingEngine.a - instead you can just specify
       LIB_FUZZING_ENGINE=-fsanitize=fuzzer to produce a valid build).
    2. Using -lFuzzingEngine is deprecated [1] for various reasons [2].
    
    The old behaviour can be emulated if desired by setting
    LIB_FUZZING_ENGINE=-lFuzzingEngine .
    
    This patch was tested as follows:
    - Building LO within oss-fuzz via:
        python infra/helper.py build_fuzzers --sanitizer address libreoffice </path/to/patched-libreoffice-core>
        python infra/helper.py check_build libreoffice
    - Building LO fuzzers standalone via:
        export CC="clang-11"
        export CXX="clang++-11 -stdlib=libc++"
        export CFLAGS="-fsanitize=address -fsanitize-address-use-after-scope -fsanitize=fuzzer-no-link -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
        export CXXFLAGS="$CFLAGS -stdlib=libc++"
        export LDFLAGS="$CFLAGS -Wl,--compress-debug-sections,zlib -lpthread"
        export LIB_FUZZING_ENGINE=-fsanitize=fuzzer
        ./autogen.sh --with-distro=LibreOfficeOssFuzz  --with-system-libxml
        make fuzzers
      (--with-system-libxml only appears to be needed because of issues
      specific to my build environment/Suse 15.2. I'm invoking clang-11 simply
      because that's the most modern clang I have installed, plain clang should
      also work on most sufficiently modern systems).
    
    [1]
    https://github.com/google/oss-fuzz/blob/481280c65048fd12fb2141b9225af511a9ef7ed2/infra/presubmit.py#L46
    [2] https://github.com/google/oss-fuzz/issues/2164
    
    Change-Id: Iddb577c30a39620e72372ef6c2d3fda67f8aabdf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111691
    Tested-by: Jenkins
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/config_host.mk.in b/config_host.mk.in
index c6c9b7eae351..2f52785b840a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -353,6 +353,7 @@ export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
 export LIBLOADER_JAR=@LIBLOADER_JAR@
 export LIBNUMBERTEXT_CFLAGS=$(gb_SPACE)@LIBNUMBERTEXT_CFLAGS@
 export LIBNUMBERTEXT_LIBS=$(gb_SPACE)@LIBNUMBERTEXT_LIBS@
+export LIB_FUZZING_ENGINE=@LIB_FUZZING_ENGINE@
 export LIBO_BIN_FOLDER=@LIBO_BIN_FOLDER@
 export LIBO_BIN_FOLDER_FOR_BUILD=@LIBO_BIN_FOLDER_FOR_BUILD@
 export LIBO_ETC_FOLDER=@LIBO_ETC_FOLDER@
diff --git a/configure.ac b/configure.ac
index 9e0085370d2b..90b0cf01633b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10396,11 +10396,15 @@ AC_MSG_CHECKING([whether to enable fuzzers])
 if test "$enable_fuzzers" != yes; then
     AC_MSG_RESULT([no])
 else
+    if test $LIB_FUZZING_ENGINE == ""; then
+      AC_MSG_ERROR(['LIB_FUZZING_ENGINE' must be set when using --enable-fuzzers. Examples include '-fsanitize=fuzzer'.])
+    fi
     AC_MSG_RESULT([yes])
     ENABLE_FUZZERS="TRUE"
     AC_DEFINE([ENABLE_FUZZERS],1)
     BUILD_TYPE="$BUILD_TYPE FUZZERS"
 fi
+AC_SUBST(LIB_FUZZING_ENGINE)
 AC_SUBST(ENABLE_FUZZERS)
 
 dnl ===================================================================
diff --git a/vcl/Executable_602fuzzer.mk b/vcl/Executable_602fuzzer.mk
index d18a9a5c9928..7ad15e87e3be 100644
--- a/vcl/Executable_602fuzzer.mk
+++ b/vcl/Executable_602fuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,602fuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,602fuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_bmpfuzzer.mk b/vcl/Executable_bmpfuzzer.mk
index da22f2f3b8df..783bbe66e3c6 100644
--- a/vcl/Executable_bmpfuzzer.mk
+++ b/vcl/Executable_bmpfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,bmpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,bmpfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_cgmfuzzer.mk b/vcl/Executable_cgmfuzzer.mk
index f7cb91520229..dcfab5d515c4 100644
--- a/vcl/Executable_cgmfuzzer.mk
+++ b/vcl/Executable_cgmfuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,cgmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,cgmfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_diffuzzer.mk b/vcl/Executable_diffuzzer.mk
index 03a05ee7c28c..b9ca63b07b0c 100644
--- a/vcl/Executable_diffuzzer.mk
+++ b/vcl/Executable_diffuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,diffuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,diffuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_docxfuzzer.mk b/vcl/Executable_docxfuzzer.mk
index b2634a390432..e33baa829017 100644
--- a/vcl/Executable_docxfuzzer.mk
+++ b/vcl/Executable_docxfuzzer.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,docxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,docxfuzzer,\
-    -lFuzzingEngine \
+    $(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_dxffuzzer.mk b/vcl/Executable_dxffuzzer.mk
index 2b8665466b42..74b46e1abec6 100644
--- a/vcl/Executable_dxffuzzer.mk
+++ b/vcl/Executable_dxffuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,dxffuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,dxffuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_epsfuzzer.mk b/vcl/Executable_epsfuzzer.mk
index 2851b43ad6af..1ac4b3df7b25 100644
--- a/vcl/Executable_epsfuzzer.mk
+++ b/vcl/Executable_epsfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,epsfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,epsfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_fodpfuzzer.mk b/vcl/Executable_fodpfuzzer.mk
index 776231dcdec1..ead31bf7d985 100644
--- a/vcl/Executable_fodpfuzzer.mk
+++ b/vcl/Executable_fodpfuzzer.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,fodpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,fodpfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_fodsfuzzer.mk b/vcl/Executable_fodsfuzzer.mk
index a60c14eae979..6c13ba174dc4 100644
--- a/vcl/Executable_fodsfuzzer.mk
+++ b/vcl/Executable_fodsfuzzer.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,fodsfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,fodsfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_fodtfuzzer.mk b/vcl/Executable_fodtfuzzer.mk
index c9801df6c678..3e832e23f154 100644
--- a/vcl/Executable_fodtfuzzer.mk
+++ b/vcl/Executable_fodtfuzzer.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,fodtfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,fodtfuzzer,\
-    -lFuzzingEngine \
+    $(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_giffuzzer.mk b/vcl/Executable_giffuzzer.mk
index 6d0458cba34e..d6aa7d402fb2 100644
--- a/vcl/Executable_giffuzzer.mk
+++ b/vcl/Executable_giffuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,giffuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,giffuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_htmlfuzzer.mk b/vcl/Executable_htmlfuzzer.mk
index 9c60941cb2a2..cbdfb5bc7aff 100644
--- a/vcl/Executable_htmlfuzzer.mk
+++ b/vcl/Executable_htmlfuzzer.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,htmlfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,htmlfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_hwpfuzzer.mk b/vcl/Executable_hwpfuzzer.mk
index 974cfd62412c..60d36644212e 100644
--- a/vcl/Executable_hwpfuzzer.mk
+++ b/vcl/Executable_hwpfuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,hwpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,hwpfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_jpgfuzzer.mk b/vcl/Executable_jpgfuzzer.mk
index daa801d45c75..72de88d93f3a 100644
--- a/vcl/Executable_jpgfuzzer.mk
+++ b/vcl/Executable_jpgfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,jpgfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,jpgfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_lwpfuzzer.mk b/vcl/Executable_lwpfuzzer.mk
index f5148e12525a..fb2573060657 100644
--- a/vcl/Executable_lwpfuzzer.mk
+++ b/vcl/Executable_lwpfuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,lwpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,lwpfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_metfuzzer.mk b/vcl/Executable_metfuzzer.mk
index 930277d3b99e..b3b0096fa8d2 100644
--- a/vcl/Executable_metfuzzer.mk
+++ b/vcl/Executable_metfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,metfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,metfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_mmlfuzzer.mk b/vcl/Executable_mmlfuzzer.mk
index b093017a776c..71083c1a08b9 100644
--- a/vcl/Executable_mmlfuzzer.mk
+++ b/vcl/Executable_mmlfuzzer.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,mmlfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,mmlfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_mtpfuzzer.mk b/vcl/Executable_mtpfuzzer.mk
index 73e30b257007..719861776f29 100644
--- a/vcl/Executable_mtpfuzzer.mk
+++ b/vcl/Executable_mtpfuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,mtpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,mtpfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_olefuzzer.mk b/vcl/Executable_olefuzzer.mk
index 4a73d573b2da..f8704e4eb2a1 100644
--- a/vcl/Executable_olefuzzer.mk
+++ b/vcl/Executable_olefuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,olefuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,olefuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_pcdfuzzer.mk b/vcl/Executable_pcdfuzzer.mk
index 65916135e383..bb93f53f545b 100644
--- a/vcl/Executable_pcdfuzzer.mk
+++ b/vcl/Executable_pcdfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,pcdfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,pcdfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_pctfuzzer.mk b/vcl/Executable_pctfuzzer.mk
index 0265fd59d58c..7584f3aa294c 100644
--- a/vcl/Executable_pctfuzzer.mk
+++ b/vcl/Executable_pctfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,pctfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,pctfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_pcxfuzzer.mk b/vcl/Executable_pcxfuzzer.mk
index ad24b43c16a2..db78be216744 100644
--- a/vcl/Executable_pcxfuzzer.mk
+++ b/vcl/Executable_pcxfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,pcxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,pcxfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_pngfuzzer.mk b/vcl/Executable_pngfuzzer.mk
index 24b9f48970fb..2b4c3e66c9c3 100644
--- a/vcl/Executable_pngfuzzer.mk
+++ b/vcl/Executable_pngfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,pngfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,pngfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_ppmfuzzer.mk b/vcl/Executable_ppmfuzzer.mk
index d0909ebba7fa..1f627529315b 100644
--- a/vcl/Executable_ppmfuzzer.mk
+++ b/vcl/Executable_ppmfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,ppmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,ppmfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_pptfuzzer.mk b/vcl/Executable_pptfuzzer.mk
index 85c8ed3c4358..70bf67281234 100644
--- a/vcl/Executable_pptfuzzer.mk
+++ b/vcl/Executable_pptfuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,pptfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,pptfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_pptxfuzzer.mk b/vcl/Executable_pptxfuzzer.mk
index 3687a1808c0b..389570a8cdd7 100644
--- a/vcl/Executable_pptxfuzzer.mk
+++ b/vcl/Executable_pptxfuzzer.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,pptxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,pptxfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_psdfuzzer.mk b/vcl/Executable_psdfuzzer.mk
index e53d3dddbb72..5c4cc28206d5 100644
--- a/vcl/Executable_psdfuzzer.mk
+++ b/vcl/Executable_psdfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,psdfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,psdfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_qpwfuzzer.mk b/vcl/Executable_qpwfuzzer.mk
index 4f81033557b4..5b5a3c4b2ed7 100644
--- a/vcl/Executable_qpwfuzzer.mk
+++ b/vcl/Executable_qpwfuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,qpwfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,qpwfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_rasfuzzer.mk b/vcl/Executable_rasfuzzer.mk
index 7440544c77f3..540e40122b8b 100644
--- a/vcl/Executable_rasfuzzer.mk
+++ b/vcl/Executable_rasfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,rasfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,rasfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_rtffuzzer.mk b/vcl/Executable_rtffuzzer.mk
index 28f0a3afe676..df486a6b50bf 100644
--- a/vcl/Executable_rtffuzzer.mk
+++ b/vcl/Executable_rtffuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,rtffuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,rtffuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_scrtffuzzer.mk b/vcl/Executable_scrtffuzzer.mk
index 6721092b2820..153c622a9702 100644
--- a/vcl/Executable_scrtffuzzer.mk
+++ b/vcl/Executable_scrtffuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,scrtffuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,scrtffuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_sftfuzzer.mk b/vcl/Executable_sftfuzzer.mk
index be2ecff64987..97a4f541aff2 100644
--- a/vcl/Executable_sftfuzzer.mk
+++ b/vcl/Executable_sftfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,sftfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,sftfuzzer,\
-    -lFuzzingEngine \
+    $(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_slkfuzzer.mk b/vcl/Executable_slkfuzzer.mk
index b37cb8f16eda..1cf375d728cc 100644
--- a/vcl/Executable_slkfuzzer.mk
+++ b/vcl/Executable_slkfuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,slkfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,slkfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_svmfuzzer.mk b/vcl/Executable_svmfuzzer.mk
index 9d41cc6ed0ae..2fadeacf97a8 100644
--- a/vcl/Executable_svmfuzzer.mk
+++ b/vcl/Executable_svmfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,svmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,svmfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_tgafuzzer.mk b/vcl/Executable_tgafuzzer.mk
index a53da7c7e539..d9fd3db345b9 100644
--- a/vcl/Executable_tgafuzzer.mk
+++ b/vcl/Executable_tgafuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,tgafuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,tgafuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_tiffuzzer.mk b/vcl/Executable_tiffuzzer.mk
index 1b8103aa055a..79bb4ad2c8f5 100644
--- a/vcl/Executable_tiffuzzer.mk
+++ b/vcl/Executable_tiffuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,tiffuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,tiffuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_wksfuzzer.mk b/vcl/Executable_wksfuzzer.mk
index 2c0776888c50..0f90ff382921 100644
--- a/vcl/Executable_wksfuzzer.mk
+++ b/vcl/Executable_wksfuzzer.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,wksfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,wksfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_wmffuzzer.mk b/vcl/Executable_wmffuzzer.mk
index 7e277e0aea33..4adfc5bbd5f2 100644
--- a/vcl/Executable_wmffuzzer.mk
+++ b/vcl/Executable_wmffuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,wmffuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,wmffuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_ww2fuzzer.mk b/vcl/Executable_ww2fuzzer.mk
index bd6f95fa3ecb..ac113f18409f 100644
--- a/vcl/Executable_ww2fuzzer.mk
+++ b/vcl/Executable_ww2fuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,ww2fuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,ww2fuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_ww6fuzzer.mk b/vcl/Executable_ww6fuzzer.mk
index cf540f89e2d0..a07ead015502 100644
--- a/vcl/Executable_ww6fuzzer.mk
+++ b/vcl/Executable_ww6fuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,ww6fuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,ww6fuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_ww8fuzzer.mk b/vcl/Executable_ww8fuzzer.mk
index 62bfd3c538f6..43de2f90a9a4 100644
--- a/vcl/Executable_ww8fuzzer.mk
+++ b/vcl/Executable_ww8fuzzer.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,ww8fuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,ww8fuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_xbmfuzzer.mk b/vcl/Executable_xbmfuzzer.mk
index fc67b8e8d990..0c22f5b88e49 100644
--- a/vcl/Executable_xbmfuzzer.mk
+++ b/vcl/Executable_xbmfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,xbmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,xbmfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_xlsfuzzer.mk b/vcl/Executable_xlsfuzzer.mk
index d3b2948d6986..99ac73b9acf7 100644
--- a/vcl/Executable_xlsfuzzer.mk
+++ b/vcl/Executable_xlsfuzzer.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,xlsfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,xlsfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_xlsxfuzzer.mk b/vcl/Executable_xlsxfuzzer.mk
index adf33c457556..715c144d8ccf 100644
--- a/vcl/Executable_xlsxfuzzer.mk
+++ b/vcl/Executable_xlsxfuzzer.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,xlsxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,xlsxfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_xpmfuzzer.mk b/vcl/Executable_xpmfuzzer.mk
index 892d5c962bb1..785762f84a0a 100644
--- a/vcl/Executable_xpmfuzzer.mk
+++ b/vcl/Executable_xpmfuzzer.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_exception_objects,xpmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_add_libs,xpmfuzzer,\
-	-lFuzzingEngine \
+	$(LIB_FUZZING_ENGINE) \
 ))
 
 # vim: set noet sw=4 ts=4:
