diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-10-21 09:35:07 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-10-27 15:29:10 +0200 |
| commit | 85c3f0d6578626e9cb965879b06d06f0fa19456a (patch) | |
| tree | a78e4b564dc62f2e711d211166cc8f42ba0575c3 /Configurations | |
| parent | 8121c0d0363eb3a513c65a7a12cc7a24c10b7d45 (diff) | |
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@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16875)
(cherry picked from commit 01451721afebabd0b7bdcd4cb3a183c9b590d266)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 1 |
1 files changed, 1 insertions, 0 deletions
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"; |