diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-08 11:14:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-08 14:05:06 +0100 |
| commit | a06f4c9c6ab09e3b30712a6c4d16ad5086ba2d9c (patch) | |
| tree | bc7553b710566a5859eb0a17655b7f0cc085683b /external | |
| parent | b1ffcbac3b90ca665c9b3b6ad0f4744aca1e43bf (diff) | |
ofz#13602 -fsanitize=vptr' not allowed with '-fno-rtti'
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>
Diffstat (limited to 'external')
| -rw-r--r-- | external/harfbuzz/UnpackedTarball_harfbuzz.mk | 6 | ||||
| -rw-r--r-- | external/harfbuzz/harfbuzz-rtti.patch | 13 |
2 files changed, 19 insertions, 0 deletions
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index 8101f244f4df..bfe7b2a9981d 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -21,4 +21,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ 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: diff --git a/external/harfbuzz/harfbuzz-rtti.patch b/external/harfbuzz/harfbuzz-rtti.patch new file mode 100644 index 000000000000..545e63981982 --- /dev/null +++ b/external/harfbuzz/harfbuzz-rtti.patch @@ -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*) |