diff options
author | Richard Levitte <levitte@openssl.org> | 2016-03-10 01:58:27 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-03-10 02:51:50 +0100 |
commit | b805b4440dbda5444da2426c98ccd40f93d8cfa5 (patch) | |
tree | 89fc7fae9065725637932acb4262dc46fbe9e237 /Configurations | |
parent | 9c17622326a7c1212872a8604bbb86146f0e74ea (diff) | |
download | openssl-b805b4440dbda5444da2426c98ccd40f93d8cfa5.zip openssl-b805b4440dbda5444da2426c98ccd40f93d8cfa5.tar.gz openssl-b805b4440dbda5444da2426c98ccd40f93d8cfa5.tar.bz2 |
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>
Diffstat (limited to 'Configurations')
-rw-r--r-- | Configurations/windows-makefile.tmpl | 5 |
1 files changed, 5 insertions, 0 deletions
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}}); |