diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-07-30 08:51:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-07-30 13:59:18 +0200 |
| commit | d12b73008a29317e779920e02ac521fd7af70017 (patch) | |
| tree | b3a0b26be5fa79987d18afb803b4fddb055f4934 /external/harfbuzz | |
| parent | fix bug in SwXMLTextBlocks::CopyBlock (diff) | |
| download | core-d12b73008a29317e779920e02ac521fd7af70017.tar.gz core-d12b73008a29317e779920e02ac521fd7af70017.zip | |
harfbuzz-rtti.patch doesn't apply
Change-Id: Ia634c008799793f3a54354a3f7fc13446f7db3c5
Reviewed-on: https://gerrit.libreoffice.org/58302
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/harfbuzz')
| -rw-r--r-- | external/harfbuzz/harfbuzz-rtti.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/external/harfbuzz/harfbuzz-rtti.patch b/external/harfbuzz/harfbuzz-rtti.patch index 83fd0f40b856..5d1cfb4959ae 100644 --- a/external/harfbuzz/harfbuzz-rtti.patch +++ b/external/harfbuzz/harfbuzz-rtti.patch @@ -1,11 +1,11 @@ --- configure +++ configure -@@ -18918,7 +18918,7 @@ - LDFLAGS="$LDFLAGS -Bsymbolic-functions" - - # Make sure we don't link to libstdc++ -- CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" -+ CXXFLAGS="$CXXFLAGS -fno-exceptions" +@@ -19012,7 +19012,7 @@ + # 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" # Assorted warnings CXXFLAGS="$CXXFLAGS -Wcast-align" |