c6db02a2af
(Somewhat oddly, there is no OStringBuffer::copy counterpart.) This required some modification to StringView::VisitCXXConstructExpr to avoid > In file included from odk/qa/checkapi/checkapi.cxx:29: > In file included from workdir/CustomTarget/odk/allheaders/allheaders.hxx:351: > In file included from instdir/sdk/include/rtl/math.hxx:31: > instdir/sdk/include/rtl/ustrbuf.hxx:1687:16: error: rather than copy, pass with a view using subView() [loplugin:stringview] > return copy( beginIndex, getLength() - beginIndex ); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ while building CppunitTest_odk_checkapi as external C++03 code, where the returned value is wrapped in a CXXConstructExpr. And testing for that case required a new CompilerTest_compilerplugins_clang-c++03 that uses gb_CXX03FLAGS and needs to not set LIBO_INTERNAL_ONLY (via gb_CompilerTest_set_external_code), as compiling as C++03 would otherwise generate lots of errors like unknown char16_t at include/sal/types.h:118. (There was a choice whether to name the new test "-c++03" or "-external", but the issue it tests is caused more by the code being compiled with C++03 than by this being external code, see above.) Change-Id: I873a9c5a70d3ea949cf13a169d46920b71282712 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130036 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
53 lines
1.4 KiB
Makefile
53 lines
1.4 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_Module_Module,solenv))
|
|
|
|
$(eval $(call gb_Module_add_targets_for_build,solenv,\
|
|
Executable_concat-deps \
|
|
Executable_gbuildtojson \
|
|
))
|
|
|
|
ifeq (,$(LOCKFILE))
|
|
$(eval $(call gb_Module_add_targets_for_build,solenv,\
|
|
$(call gb_CondExeLockfile,Executable_lockfile) \
|
|
))
|
|
endif
|
|
|
|
ifeq ($(COM),MSC)
|
|
$(eval $(call gb_Module_add_targets,solenv,\
|
|
StaticLibrary_wrapper \
|
|
Executable_gcc-wrapper \
|
|
Executable_g++-wrapper \
|
|
))
|
|
endif
|
|
|
|
ifneq ($(DISABLE_PYTHON),TRUE)
|
|
ifneq ($(MAKE_VERSION),3.81) # gbuildtojson requires 3.82+
|
|
ifneq ($(OS),WNT) # disable on Windows for now, causes gerrit/jenkins failures
|
|
ifneq ($(OS),MACOSX) # disable on macOS too, fails at least for me and would be pointless anyway surely
|
|
$(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
|
|
CustomTarget_gbuildtesttools \
|
|
PythonTest_solenv_python \
|
|
))
|
|
endif
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(COMPILER_PLUGINS),)
|
|
ifeq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),)
|
|
$(eval $(call gb_Module_add_check_targets,solenv, \
|
|
CompilerTest_compilerplugins_clang \
|
|
CompilerTest_compilerplugins_clang-c++03 \
|
|
))
|
|
endif
|
|
endif
|
|
|
|
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
|