]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Windows: use the basename of the product (.dll) for definition files
authorRichard Levitte <levitte@openssl.org>
Wed, 6 Jul 2022 04:54:49 +0000 (06:54 +0200)
committerRichard Levitte <levitte@openssl.org>
Fri, 8 Jul 2022 06:28:06 +0000 (08:28 +0200)
This resolves the faulty LIBRARY value that contained the directory
of the product (.dll) in the build tree.  This applies to engines and
other modules alike.

Fixes #18726

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/18732)

Configurations/windows-makefile.tmpl

index 47c10d79df2346e805fe570b479c459aaababb86..300b6f16ede536978f472514ba57ec9d7cd68cb3 100644 (file)
@@ -742,7 +742,7 @@ EOF
                               rel2abs($config{builddir}));
           my $ord_ver = $args{intent} eq 'lib' ? ' --version $(VERSION_NUMBER)' : '';
           my $ord_name =
-              $args{generator}->[1] || platform->dsoname($args{product});
+              $args{generator}->[1] || basename(platform->dsoname($args{product}));
           return <<"EOF";
 $target: $gen0 $deps $mkdef
        "\$(PERL)" "$mkdef"$ord_ver --type $args{intent} --ordinals $gen0 --name $ord_name --OS windows > $target