diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-14 11:03:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-14 12:13:38 +0100 |
| commit | e0a90aa3239621958bddbb30f98163e8c1ef857f (patch) | |
| tree | d9f4f3de0023624285b21c0caebb4c9f538a17bc | |
| parent | 8b66e1745933cd5aa4ae974f709a7e6c8be1f898 (diff) | |
The workaround for MSVC C4702 is still needed
...see e.g. <https://ci.libreoffice.org//job/lo_tb_master_win/29063/>
> C:\cygwin\home\tdf\lode\jenkins\workspace\lo_tb_master_win\svtools\source\misc\acceleratorexecute.cxx(213) : error C2220: the following warning is treated as an error
> C:\cygwin\home\tdf\lode\jenkins\workspace\lo_tb_master_win\svtools\source\misc\acceleratorexecute.cxx(213) : warning C4702: unreachable code
This partially reverts 5c082fc1b59022252d90423afde174123976cdee "remove some
MSVC -wd".
Change-Id: I24bc9e1b1d93cecc6d79346e6112411b1fa5989f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107676
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 89eee1b9f04b..aee3fbb38c8b 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -155,8 +155,12 @@ endif ifneq ($(COM_IS_CLANG),TRUE) # clang-cl doesn't support -Wv:18 for now +# Work around MSVC 2017 C4702 compiler bug with release builds +# http://document-foundation-mail-archive.969070.n3.nabble.com/Windows-32-bit-build-failure-unreachable-code-tp4243848.html +# http://document-foundation-mail-archive.969070.n3.nabble.com/64-bit-Windows-build-failure-after-MSVC-Update-tp4246816.html gb_CXXFLAGS += \ -Wv:18 \ + $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4702) \ endif |