util/mkdef.pl: Take shlib_variant into account

For platforms using import libraries, the lack of this causes a
disjoint between the name of the DLL that's produced, and the
corresponding import library.

Fixes #20942 (follows up #20732)

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20968)

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 3ac79821b020dd5adee9215bda22a8ea49333ed1..0599f23f0baec47446570201940c8985d0c50fca 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -197,6 +197,7 @@ foreach (@ARGV, split(/ /, $config{options}))
        }
 $libname = $unified_info{sharednames}->{libcrypto} if $do_crypto;
 $libname = $unified_info{sharednames}->{libssl} if $do_ssl;
+$libname .= $target{shlib_variant} || "";
 
 if (!$libname) {
        if ($do_ssl) {