[openssl] openssl-3.0 update
Richard Levitte
levitte at openssl.org
Wed Oct 27 13:29:40 UTC 2021
The branch openssl-3.0 has been updated
via 85c3f0d6578626e9cb965879b06d06f0fa19456a (commit)
from 8121c0d0363eb3a513c65a7a12cc7a24c10b7d45 (commit)
- Log -----------------------------------------------------------------
commit 85c3f0d6578626e9cb965879b06d06f0fa19456a
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Oct 21 09:35:07 2021 +0200
Configurations/windows-makefile.tmpl: obj2bin(): use the resource file too
When remaking how programs were linked, the variable `$ress` was forgotten.
Unfortunately, perl treats this with silence.
Fixes #16870
Fixes #16667
Reviewed-by: Tomas Mraz <tomas at openssl.org>
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16875)
(cherry picked from commit 01451721afebabd0b7bdcd4cb3a183c9b590d266)
-----------------------------------------------------------------------
Summary of changes:
Configurations/windows-makefile.tmpl | 1 +
1 file changed, 1 insertion(+)
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 78d39ffb4b..81a94ee19f 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -983,6 +983,7 @@ EOF
@{$args{objs}};
my @deps = compute_lib_depends(@{$args{deps}});
my $objs = join($target{ld_resp_delim}, @objs);
+ my $ress = join($target{ld_resp_delim}, @ress);
my $linklibs = join("", map { "$_$target{ld_resp_delim}" } @deps);
my $deps = join(" ", @objs, @ress, @deps);
return <<"EOF";
More information about the openssl-commits
mailing list