From 0a99b5a1b7325454fe3d1174d44354888aa22012 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 20 Feb 2017 16:28:06 +0100 Subject: When building with clang-cl on Windows, build CLR code with MSVC ...as clang-cl doesn't support the /clr switch. * In configure.ac, capture the MSCV version (that would be used if CC hadn't been overridden to use clang-cl) into MSVC_CXX. * The logic which flags to pass into gb_CObject__command_pattern is coded into the platform-agnostic LinkTarget.mk, so it's too late to try and filter all relevant flags in com_GCC_class.mk, depending on whether a given .cxx file is a normal one built with the normal $CXX or a special /clr one built with $MSVC_CXX. Thus, a new CxxClrObject class had to be introduced that captures this information early. * When building with clang-cl, the generated config_host/config_*.h files contain values suitable for clang-cl, but not for MSVC. But the .cxx files compiled with MSVC happen to include config_global.h, and would fail. Hack around that problem for now by introducing a hard-coded, minimal solenv/clang-cl/config_global.h that is found first when buliding such a CxxClrObject. Needs cleaning-up properly. Change-Id: Iff8aac51c0b4fa906b14503c692640dda0996d33 Reviewed-on: https://gerrit.libreoffice.org/34509 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- solenv/gbuild/Library.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'solenv/gbuild/Library.mk') diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 8042f3357010..18640d6437d4 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -175,6 +175,8 @@ $(eval $(foreach method,\ add_objcobjects \ add_objcxxobject \ add_objcxxobjects \ + add_cxxclrobject \ + add_cxxclrobjects \ add_asmobject \ add_asmobjects \ add_exception_objects \ @@ -191,6 +193,7 @@ $(eval $(foreach method,\ add_cxxflags \ add_objcxxflags \ add_objcflags \ + add_cxxclrflags \ add_defs \ set_include \ add_ldflags \ -- cgit