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)

diff --git a/Configurations/platform/Windows/MSVC.pm b/Configurations/platform/Windows/MSVC.pm
index 6109749221d698a3ba7f1ea9f58fc9f739a73074..80188f354e9285b3011096a427831935e38eb378 100644 (file)
--- 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());
 }