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

[Jan-Marek Glogowski (via logerrit)]

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

New commits:
commit b36df65bb2393f8f46eea68c861d7570e7a772a1
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sun Oct 4 20:08:57 2020 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Sun Oct 4 21:11:03 2020 +0200

    skia: don't fail Windows Arm64 build without clang
    
    Since commit 77ba9a095b0b3f429e006571e16f8320ba0bb61e we build
    Windows Arm64 with Skia, but since there is no clang compiler for
    Arm64 in VS2019, we use the normal MSVC one. So don't even try
    to detect it currently.
    
    Change-Id: I1e82a1a92bce3b8f52fe24e3095ab6e70a7a1256
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103924
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/configure.ac b/configure.ac
index a781b4ecd222..700ca2908b2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11480,7 +11480,7 @@ CLANG_CXXFLAGS_INTRINSICS_AVX512=
 CLANG_CXXFLAGS_INTRINSICS_F16C=
 CLANG_CXXFLAGS_INTRINSICS_FMA=
 
-if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then
+if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT" -a "$CPUNAME" = "ARM64" \); then
     if test -n "$CLANG_CC" -a -n "$CLANG_CXX"; then
         AC_MSG_CHECKING([for Clang])
         AC_MSG_RESULT([$CLANG_CC / $CLANG_CXX])