summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-26 09:56:21 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-26 11:54:49 +0100
commitd0008a1bfe2c0a83280eb241846b8b5739a3ba9c (patch)
treed832deb9e6953139405da2dcc26b6d18d52b75aa /solenv
parent757e2df09548351bcbb2b6a378a475b6c341bc64 (diff)
My Windows build started to need an explicit -Zc:twoPhase- for CLI now
...to acknowledge > [build CLR] cli_ure/source/climaker/climaker_emit.cxx > cl : Command line warning D9025 : overriding '/EHs' with '/EHa' > c1xx: error C2338: two-phase name lookup is not supported for C++/CLI or C++/CX; use /Zc:twoPhase- > c1xx: fatal error C1903: unable to recover from previous error(s); stopping compilation etc. Change-Id: I09cf54123345f5816f7c5b21cc9779567fd0cece Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108320 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/com_MSC_defs.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index cdcbc1fb0c48..93ed51c3ba52 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -243,6 +243,7 @@ gb_CXXCLRFLAGS := \
-wd4339 \
-Wv:18 \
-wd4267 \
+ -Zc:twoPhase- \
ifeq ($(COM_IS_CLANG),TRUE)