mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofz#13602 -fsanitize=vptr' not allowed with '-fno-rtti'

Browse Source 
Change-Id: I77beadee964f08f87f2fe7cc0daef5cb91151b72
Reviewed-on: https://gerrit.libreoffice.org/68912
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2019-03-08 11:14:13 +00:00
parent b1ffcbac3b
commit a06f4c9c6a
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
external/harfbuzz/UnpackedTarball_harfbuzz.mk vendored
View File

@@ -21,4 +21,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
external/harfbuzz/msvc.patch \ external/harfbuzz/msvc.patch \
)) ))
ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
external/harfbuzz/harfbuzz-rtti.patch \
))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

13
external/harfbuzz/harfbuzz-rtti.patch vendored Normal file
View File

@@ -0,0 +1,13 @@
--- configure
+++ configure
@@ -18959,9 +18959,7 @@
# No threadsafe statics in C++ as we do it ourselves.
# We don't use these features, so it's safe to disable them
# even in the cases where we DO link to libstdc++.
- # Put -fno-rtti before $CXXFLAGS such that users can re-enable it
- # by overriding CXXFLAGS.
- CXXFLAGS="-fno-rtti $CXXFLAGS -fno-exceptions -fno-threadsafe-statics"
+ CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-threadsafe-statics"
case "$host" in
*-*-mingw*)