[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0973b47040df02bfa56e4a91b25621027467b16c (commit)
      from  27da42d85212f80fc0db02b1cedf1d49fbfb8c43 (commit)


- Log -----------------------------------------------------------------
commit 0973b47040df02bfa56e4a91b25621027467b16c
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Jan 14 22:39:20 2018 +0100

    Fix Windows build file template to recognise .res files
    
    Only when building the main shared libraries
    
    Fixes #5075
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5077)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/windows-makefile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 51094f7..66529a2 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -501,7 +501,7 @@ EOF
      my $lib = $args{lib};
      my $shlib = $args{shlib};
      my @objs = map { (my $x = $_) =~ s|\.o$|$objext|; $x }
-                grep { $_ =~ m|\.o$| }
+                grep { $_ =~ m/\.(?:o|res)$/ }
                 @{$args{objs}};
      my @defs = grep { $_ =~ /\.def$/ } @{$args{objs}};
      my @deps = compute_lib_depends(@{$args{deps}});