diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-12 22:03:49 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-25 17:05:08 +0100 |
| commit | 37106f20bd5cc016a473fbdb2e9e37da096cff5f (patch) | |
| tree | e3b65e622f730f1e4919964721636af50c5b86cb /bin | |
| parent | fa5db38ae5bbe9abfd41b6765074ca1200b8def2 (diff) | |
oss-fuzz: convert to static cross-build
This way we can get rid of the pre-generated locale data and the
special fuzzers target, which invokes a full gbuild make for
every prereqisite, always parsing the whole tree, taking ages.
This also reverts:
- commit d0780b21cfe235c4446adf649eb690f9c1771dd5 ("fix oss-fuzz
build") by adding epubgen and revenge dependencies.
- commit ff25d6a123beb42476bf42d189b3033a86835b2a ("ofz#41602 fix
more build failure"), which shouldn't happen anymore since
commit d47628f287f4377394c4ff488c433bfe254b6abe ("don't want to
link to system static libs for DISABLE_DYNLOADING")
Change-Id: I3aed9ec62da507254b42e4e7470bae1097b4bc8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127031
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/oss-fuzz-build.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh index 906cadd500d4..d0f4564a930e 100755 --- a/bin/oss-fuzz-build.sh +++ b/bin/oss-fuzz-build.sh @@ -12,10 +12,14 @@ echo start at `date -u` #shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use #the CXX as the linker and need to pass -stdlib=libc++ to build export CXX="$CXX -stdlib=libc++ -fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt" +export CXX_FOR_BUILD="$CXX" export CC="$CC -fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt" +export CC_FOR_BUILD="$CC" #similarly force the -fsanitize etc args in as well as pthread to get #things to link successfully during the build export LDFLAGS="$CFLAGS -Wl,--compress-debug-sections,zlib -lpthread" +#build-time rsc tool leaks a titch +export ASAN_OPTIONS="detect_leaks=0" df -h $OUT $WORK @@ -24,10 +28,7 @@ $SRC/libreoffice/autogen.sh --with-distro=LibreOfficeOssFuzz --with-external-tar make clean -#build-time rsc tool leaks a titch -export ASAN_OPTIONS="detect_leaks=0" - -make fuzzers +make pushd instdir/program head -c -14 services.rdb > templateservices.rdb |