summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2021-09-26 23:52:21 +0200
committerJan-Marek Glogowski <glogow@fbihome.de>2021-09-27 11:40:14 +0200
commit074abfdfe446da400c43a7ff88e6d7b66edefa33 (patch)
treee12902108aa087137e74dff4cbd78db20113bbe9 /configure.ac
parent94956d13b7b6ad1e97777e908b968b117682a8cd (diff)
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@fbihome.de>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 2 insertions, 0 deletions
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