45d93ea927
That flag is only supported by clang-cl, not by MSVC, andc7c9f3f57a"use clang-cl's -Zc:dllexportInlines- for clang-cl builds" apparently naively assumed that it would work to build LO with clang-cl and that flag without actually trying it out, and1040228c35"My clang-cl build does not work with -Zc:dllexportInlines-" effectively disabled it completely. The way to avoid unresolved external symbols during linking of URE libraries (see the1040228c35commit message) is apparently to also build libraries that the URE libraries depend on with the flag, hence the change from gb_Library_set_is_ure_library to gb_Library_set_is_ure_library_or_dependency. For now, I only marked those additional libraries (unoil and xmlreader) that actually caused issues when linking the URE libraries. Change-Id: I3a85c73246250981cd86b7ee41f87b41f393a4b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126012 Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Tested-by: Jenkins
40 lines
1.3 KiB
Makefile
40 lines
1.3 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_Library_Library,salhelper))
|
|
|
|
$(eval $(call gb_Library_add_defs,salhelper,\
|
|
-DSALHELPER_DLLIMPLEMENTATION \
|
|
))
|
|
|
|
$(eval $(call gb_Library_set_is_ure_library_or_dependency,salhelper))
|
|
|
|
$(eval $(call gb_Library_use_libraries,salhelper,\
|
|
sal \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,salhelper,\
|
|
salhelper/source/condition \
|
|
salhelper/source/dynload \
|
|
salhelper/source/simplereferenceobject \
|
|
salhelper/source/thread \
|
|
salhelper/source/timer \
|
|
))
|
|
|
|
# At least on Linux, for backwards compatibility the salhelper library needs a
|
|
# specific soname and symbol versioning. The symbols in the gcc3.map should be
|
|
# those not already filtered out due to hidden visibility, so combining the
|
|
# visibility feature with the version map file feature works well.
|
|
# Solaris would need something like this, too. Its backwards compatibility is
|
|
# broken for now:
|
|
|
|
$(eval $(call gb_Library_set_soversion_script,salhelper,$(SRCDIR)/salhelper/source/gcc3.map))
|
|
|
|
# vim: set noet sw=4 ts=4:
|