diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-11-09 20:01:51 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-11-10 15:51:42 +0100 |
| commit | 186a31e510d1326063cfeca17e58fadec236ad2a (patch) | |
| tree | 229bc2215ceeac6eac726c455a52be262e19b82d /Configurations/windows-makefile.tmpl | |
| parent | 42e055e12496a0eab72c64de845aa5bb18a9c4a2 (diff) | |
Building: make it possible to force linking with static OpenSSL libs
Very simply, support having the .a extension to denote depending on
static libraries. Note that this is not supported on native Windows
when building shared libraries, as there is not static library then,
just an import library with the same name.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1889)
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index a0ee953dc6..d7441107c9 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -347,8 +347,10 @@ configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{b # It takes a list of library names and outputs a list of dependencies sub compute_lib_depends { if ($disabled{shared}) { - return map { $_.$libext } @_; + return map { $_ =~ /\.a$/ ? $`.$libext : $_.$libext } @_; } + die "Linking with static OpenSSL libraries is not supported in this configuration\n" + if grep /\.a$/, @_; return map { shlib_import($_) } @_; } |