[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

[Caolán McNamara (via logerrit)]

 bin/oss-fuzz-build.sh |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit c9c9d40f79f1767a0a824fc421f2e476c3f24eb8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 20 19:46:21 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 20 20:58:17 2021 +0200

    ofz: can now undo temp -L/usr/msan/lib hack
    
    now that https://github.com/google/oss-fuzz/pull/6493 has landed
    
    Change-Id: I38634fec9c3e6c50499f1164d7b873dd1889efe6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122368
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 2bed84d865e4..906cadd500d4 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -12,9 +12,6 @@ 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"
-if [[ $SANITIZER_FLAGS = *sanitize=memory* ]]; then
-    export CXX="$CXX -Wno-unused-command-line-argument -L/usr/msan/lib"
-fi
 export CC="$CC -fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt"
 #similarly force the -fsanitize etc args in as well as pthread to get
 #things to link successfully during the build