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

[Michael Stahl (via logerrit)]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 307b39ac9ced9a31157f9ec7ec1b125fe3f34779
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Fri Oct 11 13:47:59 2019 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Mon Oct 14 10:55:38 2019 +0200

    configure: remove sanitizer flags from default COMPILER_PLUGINS_CXX
    
    When COMPILER_PLUGINS_CXX is default initialised from $CXX, filter out
    sanitizer flags, because:
    a) linking fails with unresolved symbols currently
    b) typically the slowdown is unhelpful in a build
    c) if anybody wants a sanitized plugin they can set COMPILER_PLUGINS_CXX
       manually
    
    (init from CXX was added in ad5cbcf6ba0afdc1d8d7405c2641cce8de4a360b)
    
    Change-Id: I64dc48fae5f7a23f87b0eee0545add9a1ebd5672
    Reviewed-on: https://gerrit.libreoffice.org/80655
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/configure.ac b/configure.ac
index 717dafe71648..a0c69e8cb3b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7009,7 +7009,7 @@ if test "$COM_IS_CLANG" = "TRUE"; then
         fi
         # Assume Clang is self-built, but allow overriding COMPILER_PLUGINS_CXX to the compiler Clang was built with.
         if test -z "$COMPILER_PLUGINS_CXX"; then
-            COMPILER_PLUGINS_CXX=$CXX
+            COMPILER_PLUGINS_CXX=[$(echo $CXX | sed -e 's/-fsanitize=[^ ]*//g')]
         fi
         clangbindir=$CLANGDIR/bin
         if test "$build_os" = "cygwin"; then