diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-08-02 13:30:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-08-02 15:21:48 +0200 |
| commit | 9bbed2130708aa28d8650394cf112b5932224059 (patch) | |
| tree | e9f8b8b2425b79fecf67e189c7a58711a79c37d2 /external | |
| parent | 4a3da80a9eb1a95a4cd3c8a98a37d480d7a29bba (diff) | |
external/skia: Avoid -std:c++20 with known-broken VS-provided clang-cl
...as witnessed with patch set 1 of
<https://gerrit.libreoffice.org/c/core/+/155121/1> "Bump baseline to C++20",
> In file included from C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/skia/src/base/SkBezierCurves.cpp:8:
> In file included from C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/skia\src/base/SkBezierCurves.h:10:
> C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/skia\include/private/base/SkSpan_impl.h(122,1): error: C++ requires a type specifier for all declarations
> SkSpan(Container&&) ->
> ^
> C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/skia/src/base/SkBezierCurves.cpp(185,12): error: use of class template 'SkSpan' requires template arguments
> return SkSpan{intersectionStorage, intersectionCount};
> ^
> C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/skia\include/private/base/SkSpan_impl.h(64,7): note: template is declared here
> class SkSpan {
> ^
etc. (<https://ci.libreoffice.org/job/gerrit_windows/160027/>)
Change-Id: I6166f1cb49ac1540ec1c4d3bc3331c8b228efa27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155228
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/skia/Library_skia.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index 77e674a0b5e2..c2163d299327 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -50,6 +50,15 @@ $(eval $(call gb_Library_add_cxxflags,skia, \ )) endif +# The clang-cl provided with at least VS 2019 16.11.28 is known-broken with -std:c++20: +ifneq ($(filter -std:c++20,$(CXXFLAGS_CXX11)),) +ifeq ($(LO_CLANG_VERSION),120000) +$(eval $(call gb_Library_add_cxxflags,skia, \ + -std:c++17 \ +)) +endif +endif + $(eval $(call gb_Library_use_system_win32_libs,skia,\ fontsub \ ole32 \ |