From: Richard Levitte <levitte@openssl.org>
Date: Thu, 10 Mar 2016 00:58:27 +0000 (+0100)
Subject: When configured "shared", don't build static libraries on Windows
X-Git-Tag: OpenSSL_1_1_0-pre4~99
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b805b4440dbda5444da2426c98ccd40f93d8cfa5;p=oweals%2Fopenssl.git

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@openssl.org>
---

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 77cc377fce..7b78f9f4d9 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}});