diff options
| -rw-r--r-- | external/harfbuzz/UnpackedTarball_harfbuzz.mk | 6 | ||||
| -rw-r--r-- | external/harfbuzz/harfbuzz-rtti.patch | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index 1f9f15f355c0..9a5560fda96f 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -17,4 +17,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ external/harfbuzz/ubsan.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..94b4daeb96d6 --- /dev/null +++ b/external/harfbuzz/harfbuzz-rtti.patch @@ -0,0 +1,11 @@ +--- configure ++++ configure +@@ -16799,7 +16799,7 @@ + LDFLAGS="$LDFLAGS -Bsymbolic-functions" + + # Make sure we don't link to libstdc++ +- CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" ++ CXXFLAGS="$CXXFLAGS -fno-exceptions" + + # Assorted warnings + CXXFLAGS="$CXXFLAGS -Wcast-align" |