summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-03-02 09:44:49 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-03-02 13:42:17 +0100
commit1a731e502be698132d3063f2eebde23f8ac98b4c (patch)
treebb225a2426ea12b8f3c19d9339f5a621d50d6a15 /configure.ac
parentca638eedc65a7f9ae99094a728696905ca95766d (diff)
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@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac5
1 files changed, 5 insertions, 0 deletions
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++])
],