diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 10:19:24 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 15:50:05 +0100 |
commit | 50cb96346ad54bcdb172acf11b4befe540e2b152 (patch) | |
tree | 040135786ecb882c5b8eb457db6a90bd87e141d3 /configure.ac | |
parent | f2b70baa6343f8c4ac2b4102a9fe62f79aa7870b (diff) |
Use correct __cplusplus value with MSVC
...now that /Zc:__cplusplus is available in Visual Studio 2017 version 15.7
(see <https://blogs.msdn.microsoft.com/vcblog/2018/04/09/
msvc-now-correctly-reports-__cplusplus/>).
Some external projects might run into issues when picking up /Zc:__cplusplus
directly with $(CXXFLAGS_CXX11) or indirectly via $(gb_CXXFLAGS) now, but that
appears not to be the case.
Some obsolete MSVC-specific __cplusplus checks can be removed now. (The ones in
external/libebook/libebook-msvc.patch.1 pick up /Zc:__cplusplus via
$(gb_CXXFLAGS) in external/libebook/ExternalProject_libebook.mk.)
Change-Id: Idc6849a0000ea424522f30f61caba112fae25d40
Reviewed-on: https://gerrit.libreoffice.org/64755
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 44143a0c81a1..04bac9d771ae 100644 --- a/configure.ac +++ b/configure.ac @@ -6208,7 +6208,7 @@ dnl =================================================================== AC_MSG_CHECKING([whether $CXX supports C++17]) CXXFLAGS_CXX11= if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then - CXXFLAGS_CXX11=-std:c++17 + CXXFLAGS_CXX11='-std:c++17 -Zc:__cplusplus' elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then my_flags='-std=gnu++2a -std=c++2a -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z' for flag in $my_flags; do |