summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2023-09-24 18:49:09 +0300
committerStephan Bergmann <sbergman@redhat.com>2023-09-24 20:58:33 +0200
commit19e9fe7c8c89399753ac1730e1c76378b18418bc (patch)
tree1d85173f8a69aacc83e0ab36260da7ef9dd39452
parent90c97ccfd8c0324fffec8852935e71e1f0670d76 (diff)
Adapt a hard-coded value hack
...from 22267b7797340d1eb52ced10fe05afeb8a42fc2b "When building with clang-cl, nevertheless use MSVC's CXXFLAGS_CXX11 for CLR" to 1eef07805021b7ca26a1a8894809b6d995747ba1 "Bump baseline to C++20" Change-Id: I817a33b7ca5ae4db232bf4c983d46e808dc83f24 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157230 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--solenv/gbuild/platform/com_MSC_defs.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 63e618783e63..0a3df54ce49c 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -271,7 +271,7 @@ gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
# in CLR meta-data - use of this type may lead to a runtime exception":
gb_CXXCLRFLAGS := \
$(if $(COM_IS_CLANG), \
- $(patsubst -std=%,-std:c++17 -Zc:__cplusplus,$(gb_CXXFLAGS)), \
+ $(patsubst -std=%,-std:c++20 -Zc:__cplusplus,$(gb_CXXFLAGS)), \
$(gb_CXXFLAGS)) \
$(gb_LinkTarget_EXCEPTIONFLAGS) \
-AI $(INSTDIR)/$(LIBO_URE_LIB_FOLDER) \