diff options
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r-- | RepositoryExternal.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index cce87079d951..7a34f2243e4e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1592,13 +1592,14 @@ define gb_LinkTarget__use_openssl $(call gb_LinkTarget_use_package,$(1),openssl) ifeq ($(OS),WNT) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \ + $(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.lib \ + $(call gb_UnpackedTarball_get_dir,openssl)/libssl.lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \ $(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \ + $(if $(filter $(OS),LINUX),-pthread) \ ) $(call gb_LinkTarget_use_external_project,$(1),openssl) ifeq ($(OS),SOLARIS) @@ -3262,12 +3263,18 @@ $(call gb_LinkTarget_add_libs,$(1),\ else $(call gb_LinkTarget_add_libs,$(1),\ -L$(call gb_UnpackedTarball_get_dir,python3) \ - -lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \ + -lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \ ) endif endef +# this is only used by python currently +define gb_ExternalProject__use_libffi +$(call gb_ExternalProject_use_external_project,$(1),libffi) + +endef + endif # SYSTEM_PYTHON # ORCUS |