Kaydet (Commit) 4101e437 authored tarafından Michael Stahl's avatar Michael Stahl

xmlsecurity: try to appease --as-needed default ld

Change-Id: I11a7894cb71732e613ae430c128ce06becb4defb
üst 42ecf7b5
...@@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_packages,xsec_xmlsec,\ ...@@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_packages,xsec_xmlsec,\
$(eval $(call gb_Library_use_externals,xsec_xmlsec,\ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
boost_headers \ boost_headers \
libxml2 \ libxml2 \
nss3 \
)) ))
$(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
...@@ -76,7 +75,6 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ ...@@ -76,7 +75,6 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_CRYPTO_MSCRYPTO \ -DXMLSEC_CRYPTO_MSCRYPTO \
)) ))
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ $(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-mscrypto.lib \
$(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec.lib \ $(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec.lib \
...@@ -133,6 +131,11 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ ...@@ -133,6 +131,11 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
endif endif
# nss3 after static libs to appease --as-needed linkers
$(eval $(call gb_Library_use_externals,xsec_xmlsec,\
nss3 \
))
ifeq ($(OS),SOLARIS) ifeq ($(OS),SOLARIS)
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
-ldl \ -ldl \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment