diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-13 15:55:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-13 15:55:26 +0100 |
| commit | 7ad758a53a7cef0ed7b39182d45a64be427b1394 (patch) | |
| tree | f08e43afb4192204fe9cd0fa716b417fae03609a /external | |
| parent | 93488dd9843c62d46f1894a6d5005871bc60b98c (diff) | |
external/harfbuzz: -fsanitize=vptr needs -frtti
Change-Id: I4da774b8ebd2115a7f1ae717843498c0f452f7df
Diffstat (limited to 'external')
| -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" |