From: Richard Levitte <levitte@openssl.org>
Date: Fri, 11 Dec 2020 15:25:13 +0000 (+0100)
Subject: Building: Fix the library file names for MSVC builds to include multilib
X-Git-Tag: openssl-3.0.0-alpha10~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e841938349a2897def004c9c8cf0131d158a0c29;p=thirdparty%2Fopenssl.git

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 6109749221d..80188f354e9 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());
 }