[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann]

 configure.ac |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 1a731e502be698132d3063f2eebde23f8ac98b4c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 2 09:44:49 2018 +0100

    Adapt configure.ac to more ways of making UBSan errors fatal
    
    Change-Id: I095ef821b7ab80527d36a32394b34c56c7e2190a
    Reviewed-on: https://gerrit.libreoffice.org/50615
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index e5fcd807f461..7da2bfd87a8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10826,9 +10826,13 @@ int main(int argc, char **argv) {
             #  02 00 80 3a  90 8a 4e d2 3a 00 00 00  f0 b4 b9 a7 ff 7f 00 00  00 00 00 00 00 00 00 00  20 d8 4e d2
             #               ^~~~~~~~~~~~~~~~~~~~~~~
             #               vptr for 'QObjectPrivate'
+            # so temporarily ignore here whichever way would be used to make such errors fatal
+            # (-fno-sanitize-recover=... or UBSAN_OPTIONS halt_on_error=1):
             save_CXX=$CXX
             CXX=$(printf %s "$CXX" \
                 | sed -e 's/-fno-sanitize-recover\(=[[0-9A-Za-z,_-]]*\)*//')
+            save_UBSAN_OPTIONS=$UBSAN_OPTIONS
+            UBSAN_OPTIONS=$UBSAN_OPTIONS:halt_on_error=0
             save_CXXFLAGS=$CXXFLAGS
             CXXFLAGS="$CXXFLAGS $KDE4_CFLAGS"
             save_LIBS=$LIBS
@@ -10905,6 +10909,7 @@ int main(int argc, char *argv[])
 
             LIBS=$save_LIBS
             CXXFLAGS=$save_CXXFLAGS
+            UBSAN_OPTIONS=$save_UBSAN_OPTIONS
             CXX=$save_CXX
             AC_LANG_POP([C++])
         ],