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

[Luboš Luňák (via logerrit)]

 configure.ac |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 4e61f3844982965dad4e206a8bf4dfec4174c805
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Apr 20 16:28:23 2020 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Apr 20 17:49:40 2020 +0200

    fix --enable-64-bit Windows build with Clang for Skia
    
    Change-Id: Ia55e0b6ab6b970cbafe2c8283b255eae0ad66567
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92577
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 376bdf4816da..ada79b6dfd45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11130,9 +11130,11 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then
             AC_MSG_CHECKING([for clang-cl])
             if test -x "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"; then
                 CLANG_C=`win_short_path_for_make "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"`
+                dnl match our MSVC default, also explicitly set -m32/-m64
                 if test "$BITNESS_OVERRIDE" = ""; then
-                    dnl match our MSVC default
-                    CLANG_C="$CLANG_C -arch:SSE"
+                    CLANG_C="$CLANG_C -m32 -arch:SSE"
+                else
+                    CLANG_C="$CLANG_C -m64"
                 fi
                 CLANG_CXX="$CLANG_C"
                 AC_MSG_RESULT([$CLANG_C])