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

[Jan-Marek Glogowski (via logerrit)]

 configure.ac |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 074abfdfe446da400c43a7ff88e6d7b66edefa33
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sun Sep 26 23:52:21 2021 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Mon Sep 27 11:40:14 2021 +0200

    Fix Windows Arm64 build (Cuckoo and Skia)
    
    Add CUCKOO to the list of permitted BUILD_TARGETS for
    gb_Side=build and correctly skip Skia after commit
    9714f3348d972a179e73423c44a97954bf6cc534 ("do not
    special-case Clang for Skia on Windows Arm64").
    
    Change-Id: Ic5ec56b9525457a5455e55dd5034c03bcddf8b1f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122664
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/configure.ac b/configure.ac
index 32267249702b..d21e92bcb771 100644
--- a/configure.ac
+++ b/configure.ac
@@ -918,6 +918,7 @@ cygwin*|wsl*)
     LINKFLAGSNOUNDEFS=
 
     if test "$host_cpu" = "aarch64"; then
+        build_skia=no
         enable_gpgmepp=no
         enable_coinmp=no
         enable_firebird_sdbc=no
@@ -5526,6 +5527,7 @@ if test "$cross_compiling" = "yes"; then
         BOOST
         CAIRO
         CLUCENE
+        CUCKOO
         CURL
         DBCONNECTIVITY
         DESKTOP