summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2023-05-15 14:30:43 +0200
committerTomas Mraz <tomas@openssl.org>2023-05-25 15:54:31 +0200
commitd2c6435cd739811def28f6809db0fd068f5cdc60 (patch)
tree7691b6394e2cbd439c66cf43e0cdba9ccd9dc86c
parentcd6f72a71d298d9ea5964999cf48afd15957e13c (diff)
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)
-rwxr-xr-xutil/mkdef.pl1
1 files changed, 1 insertions, 0 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 3ac79821b0..0599f23f0b 100755
--- 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) {