diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2018-01-03 15:26:39 -0500 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2018-01-03 15:33:47 -0500 |
| commit | d329d2d3e49662eb41b1fec74d55d4738394ba7d (patch) | |
| tree | c95e92e97be9e405f94ae09237638b2cf00e5d82 | |
| parent | d8d5354bba437828660b3c991807e0be66bc5029 (diff) | |
| download | postgresql-d329d2d3e49662eb41b1fec74d55d4738394ba7d.tar.gz postgresql-d329d2d3e49662eb41b1fec74d55d4738394ba7d.zip | |
Fix use of config-specific libraries for Windows OpenSSL
Commit 614350a3 allowed for an different builds of OpenSSL libraries on
Windows, but ignored the fact that the alternative builds don't have
config-specific libraries. This patch fixes the Solution file to ask for
the correct libraries.
per offline discussions with Leonardo Cecchi and Marco Nenciarini,
Backpatch to all live branches.
| -rw-r--r-- | src/tools/msvc/Solution.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 1d912eba241..4714898d70b 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -506,10 +506,12 @@ sub AddProject } else { + # We don't expect the config-specific library to be here, + # so don't ask for it in last parameter $proj->AddLibrary( - $self->{options}->{openssl} . '\lib\ssleay32.lib', 1); + $self->{options}->{openssl} . '\lib\ssleay32.lib', 0); $proj->AddLibrary( - $self->{options}->{openssl} . '\lib\libeay32.lib', 1); + $self->{options}->{openssl} . '\lib\libeay32.lib', 0); } } if ($self->{options}->{nls}) |