postgres.git / summary / log / commit / refs

commit    d329d2d3e49662eb41b1fec74d55d4738394ba7d
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Wed Jan 03 20:26:39 2018 +0000
First released in: 11.0, 9.3.21, 9.4.16, 9.5.11, 9.6.7, 10.2

    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.


 src/tools/msvc/Solution.pm | 6 ++++--
 1 file 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})


[parent: d8d5354bba43]