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

[Stephan Bergmann]

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

New commits:
commit 786f29a9edf81cc85c62459b3ea2fd91646d4e56
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Apr 28 15:00:48 2016 +0200

    Use COMPILER_PLUGINS_CXX during configure
    
    Change-Id: I600a6b96a64fc82cde72200b78f60001a2dba82a

diff --git a/configure.ac b/configure.ac
index ae441cb..d331b42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6668,7 +6668,7 @@ if test "$COM_IS_CLANG" = "TRUE"; then
         save_CXX=$CXX
         # compiler plugins must be built with "native" bitness of clang
         # because they link against clang libraries
-        CXX=`echo $CXX | sed -e s/-m64// -e s/-m32//`
+        CXX=${COMPILER_PLUGINS_CXX-$(echo $CXX | sed -e s/-m64// -e s/-m32//)}
         CPPFLAGS="$CPPFLAGS $CXXFLAGS_CXX11 -I$CLANGDIR/include -I$CLANGDIR/tools/clang/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
         AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h,
             [COMPILER_PLUGINS=TRUE],