[Libreoffice-commits] core.git: external/skia

[Jan-Marek Glogowski (via logerrit)]

 external/skia/Library_skia.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 77ba9a095b0b3f429e006571e16f8320ba0bb61e
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Thu Oct 1 23:02:38 2020 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Fri Oct 2 04:32:01 2020 +0200

    skia: fix Windows Arm64 build
    
    This uses MSVC instead of clang for this host.
    
    Change-Id: Idf96668e00563be12a7819a1658b657673733d21
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103780
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 7712c6be9e77..643c41a4ce38 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -13,8 +13,12 @@ $(eval $(call gb_Library_set_warnings_disabled,skia))
 
 $(eval $(call gb_Library_use_unpacked,skia,skia))
 
+ifneq ($(OS)_$(CPUNAME),WNT_ARM64)
 $(eval $(call gb_Library_use_clang,skia))
 $(eval $(call gb_Library_set_clang_precompiled_header,skia,external/skia/inc/pch/precompiled_skia))
+else
+$(eval $(call gb_Library_set_precompiled_header,skia,external/skia/inc/pch/precompiled_skia))
+endif
 
 $(eval $(call gb_Library_add_defs,skia,\
     -DSKIA_IMPLEMENTATION=1 \