diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-12-11 16:25:13 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-12-13 00:26:29 +0100 |
| commit | e841938349a2897def004c9c8cf0131d158a0c29 (patch) | |
| tree | 4b37b3ed4b3cbe9261d0465829b7fd7bf081bb93 /Configurations | |
| parent | 68e91251826949430270edfbf6dd5f334eb4df57 (diff) | |
Building: Fix the library file names for MSVC builds to include multilib
In OpenSSL 1.1.1, VC-WIN64I and VC-WIN64A have a 'multilib' attribute
set, which affect the names of the produced libcrypto and libssl DLLs.
This restores that for OpenSSL 3.0.
Fixes #13659
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13670)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/platform/Windows/MSVC.pm | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Configurations/platform/Windows/MSVC.pm b/Configurations/platform/Windows/MSVC.pm index 6109749221..80188f354e 100644 --- a/Configurations/platform/Windows/MSVC.pm +++ b/Configurations/platform/Windows/MSVC.pm @@ -14,6 +14,17 @@ use configdata; sub pdbext { '.pdb' } +# It's possible that this variant of |sharedname| should be in Windows.pm. +# However, this variant was VC only in 1.1.1, so we maintain that here until +# further notice. +sub sharedname { + return platform::BASE::__concat(platform::BASE->sharedname($_[1]), + "-", + $_[0]->shlib_version_as_filename(), + ($target{multilib} // '' ), + ($_[0]->shlibvariant() // '')); +} + sub staticlibpdb { return platform::BASE::__concat($_[0]->staticname($_[1]), $_[0]->pdbext()); } |