[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/com_MSC_defs.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 95d109fd5f254f694684c0effe447f133872f40d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed May 19 08:23:57 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed May 19 09:25:06 2021 +0200

    Document that setting gb_CXX03FLAGS for clang-cl doesn't work
    
    Setting it to
    
    > gb_CXX03FLAGS := -Xclang -std=gnu++98 -Werror=c++11-extensions -Wno-c++11-long-long -Wno-deprecated-declarations
    
    similar to the solenv/gbuild/platform/com_GCC_defs.mk setting would cause lots
    of errors like
    
    > In file included from <built-in>:1:
    > In file included from C:\llvm\inst\lib\clang\13.0.0\include\Intrin.h:33:
    > C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\setjmp.h(168,11): error: expected function body after function declarator
    >         ) noexcept(false);
    >           ^
    > In file included from C:/lo-clang/core/odk/qa/checkapi/checkapi.cxx:22:
    > In file included from C:/lo-clang/core/workdir/UnpackedTarball/cppunit/include\cppunit/plugin/TestPlugIn.h:8:
    > In file included from C:/lo-clang/core/workdir/UnpackedTarball/cppunit/include\cppunit/plugin/PlugInParameters.h:8:
    > In file included from C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\deque:11:
    > In file included from C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\xmemory:11:
    > C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\cstdint(55,11): error: expected identifier or '{'
    > namespace _DEPRECATE_TR1_NAMESPACE tr1 {
    >           ^
    > C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\yvals_core.h(611,5): note: expanded from macro '_DEPRECATE_TR1_NAMESPACE'
    >     [[deprecated(                                                                                                 \
    >     ^
    
    (where the first one comes from -FIIntrin.h that needs to be part of $(CXX) to
    have the intrinsics available in all compilation units)
    
    Change-Id: I1e8f135dd429dd18deb6df33dfa71e2fcbefa9f7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115776
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 0ec843e9889e..4c3b4e21e737 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -185,7 +185,8 @@ gb_STDLIBS := \
 
 gb_CFLAGS_WERROR = $(if $(ENABLE_WERROR),-WX)
 
-# there does not seem to be a way to force C++03 with MSVC
+# there does not seem to be a way to force C++03 with MSVC, nor with clang-cl against MSVC system
+# headers
 gb_CXX03FLAGS :=
 
 gb_LinkTarget_EXCEPTIONFLAGS := \