[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b805b4440dbda5444da2426c98ccd40f93d8cfa5 (commit)
      from  9c17622326a7c1212872a8604bbb86146f0e74ea (commit)


- Log -----------------------------------------------------------------
commit b805b4440dbda5444da2426c98ccd40f93d8cfa5
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 10 01:58:27 2016 +0100

    When configured "shared", don't build static libraries on Windows
    
    The reason for this is that the static libraries and the DLL import
    libraries are named the same on Windows.  When configured "shared",
    the static libraries are unused anyway.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configurations/windows-makefile.tmpl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 77cc377..7b78f9f 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -298,6 +298,11 @@ $objs$linklibs \$(EX_LIBS)
 EOF
  }
  sub obj2lib {
+     # Because static libs and import libs are both named the same in native
+     # Windows, we can't have both.  We skip the static lib in that case,
+     # as the shared libs are what we use anyway.
+     return "" unless $disabled{"shared"};
+
      my %args = @_;
      my $lib = $args{lib};
      my $objs = join("\n", map { $_.$objext } @{$args{objs}});