configure.ac | 2 +- external/skia/Library_skia.mk | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-)
New commits: commit 9714f3348d972a179e73423c44a97954bf6cc534 Author: Luboš Luňák <l.lu...@centrum.cz> AuthorDate: Mon Sep 20 00:17:15 2021 +0000 Commit: Luboš Luňák <l.lu...@collabora.com> CommitDate: Tue Sep 21 10:30:00 2021 +0200 do not special-case Clang for Skia on Windows Arm64 We hard-require Clang for Skia, because MSVC compiles it poorly. Somebody who doesn't want or can't use Clang may just as well use --disable-skia. This reverts commit 77ba9a095b0b3f429e006571e16f8320ba0bb61e. This reverts commit b36df65bb2393f8f46eea68c861d7570e7a772a1. Change-Id: If0310ce13e4023c6ae43f96447b48665ab7e4353 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122336 Tested-by: Luboš Luňák <l.lu...@collabora.com> Reviewed-by: Luboš Luňák <l.lu...@collabora.com> diff --git a/configure.ac b/configure.ac index c03ea04085f7..643d2f95281d 100644 --- a/configure.ac +++ b/configure.ac @@ -12052,7 +12052,7 @@ LO_CLANG_CXXFLAGS_INTRINSICS_F16C= LO_CLANG_CXXFLAGS_INTRINSICS_FMA= HAVE_LO_CLANG_DLLEXPORTINLINES= -if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT" -a "$CPUNAME" = "AARCH64" \); then +if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then if test -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then AC_MSG_CHECKING([for Clang]) AC_MSG_RESULT([$LO_CLANG_CC / $LO_CLANG_CXX]) diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index b1b4f874f44a..0989e7e337c9 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -13,12 +13,8 @@ $(eval $(call gb_Library_set_warnings_disabled,skia)) $(eval $(call gb_Library_use_unpacked,skia,skia)) -ifneq ($(OS)_$(CPUNAME),WNT_AARCH64) $(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 \