summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-09-20 19:46:21 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-09-20 20:58:17 +0200
commitc9c9d40f79f1767a0a824fc421f2e476c3f24eb8 (patch)
treed3ec76d89a043420e1944e13a866140ae74b5db7
parent45e8b85a50bf153b6c9f627e731eecee1cf966f2 (diff)
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@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rwxr-xr-xbin/oss-fuzz-build.sh3
1 files changed, 0 insertions, 3 deletions
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