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:12 -0500 |
| commit | 0fb69340b2352d8491d15c11156d16988676f71f (patch) | |
| tree | 7aac3e96db93f7eb0d51e40b8c6ab233ced4546e | |
| parent | 43fb4b42230d23e235bed895734a0931fa4c496d (diff) | |
| download | postgresql-0fb69340b2352d8491d15c11156d16988676f71f.tar.gz postgresql-0fb69340b2352d8491d15c11156d16988676f71f.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 696da2be920..761e920576d 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -537,10 +537,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}) |