xmlsecurity/Library_xsec_xmlsec.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
New commits: commit 4101e437564727af3dc5d61915b7bf6775f72d82 Author: Michael Stahl <[email protected]> Date: Wed May 31 12:14:00 2017 +0200 xmlsecurity: try to appease --as-needed default ld Change-Id: I11a7894cb71732e613ae430c128ce06becb4defb diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index db161c13995f..01619188424b 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_packages,xsec_xmlsec,\ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ boost_headers \ libxml2 \ - nss3 \ )) $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ @@ -76,7 +75,6 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ -DXMLSEC_CRYPTO_MSCRYPTO \ )) - $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ $(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec-mscrypto.lib \ $(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec.lib \ @@ -133,6 +131,11 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ endif +# nss3 after static libs to appease --as-needed linkers +$(eval $(call gb_Library_use_externals,xsec_xmlsec,\ + nss3 \ +)) + ifeq ($(OS),SOLARIS) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ -ldl \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
