Tweak MSVC build system to match changes in 7143b3e82.

Also try to make the comment suggesting that this might be needed
more intelligible.

Per buildfarm.

diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 9ac06874b8d7ade0dc3b84d375ebb2e8817693e9..c2171d0856cca963d1ab465d829716d6ab68ff0a 100644 (file)
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -24,8 +24,9 @@ ifneq ($(PORTNAME), win32)
 override CFLAGS += $(PTHREAD_CFLAGS)
 endif
 
-# We can't use Makefile variables here because the MSVC build system scrapes
-# OBJS from this file.
+# The MSVC build system scrapes OBJS from this file.  If you change any of
+# the conditional additions of files to OBJS, update Mkvcbuild.pm to match.
+
 OBJS=  fe-auth.o fe-auth-scram.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
        fe-protocol2.o fe-protocol3.o pqexpbuffer.o fe-secure.o \
        libpq-events.o

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 640a4b70d6360e1ee0021768a4b4412a48d5bbda..4d436d3e7ac333b8b6ff5dd812c36cf3e55981d9 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -182,8 +182,8 @@ sub mkvcbuild
        $postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap});
        $postgres->FullExportDLL('postgres.lib');
 
-       # The OBJS scraper doesn't know about ifdefs, so remove be-secure-openssl.c
-       # if building without OpenSSL
+       # The OBJS scraper doesn't know about ifdefs, so remove appropriate files
+       # if building without OpenSSL.
        if (!$solution->{options}->{openssl})
        {
                $postgres->RemoveFile('src/backend/libpq/be-secure-common.c');
@@ -242,18 +242,12 @@ sub mkvcbuild
                'src/interfaces/libpq/libpq.rc');
        $libpq->AddReference($libpgport);
 
-       # The OBJS scraper doesn't know about ifdefs, so remove fe-secure-openssl.c
-       # and sha2_openssl.c if building without OpenSSL, and remove sha2.c if
-       # building with OpenSSL.
+       # The OBJS scraper doesn't know about ifdefs, so remove appropriate files
+       # if building without OpenSSL.
        if (!$solution->{options}->{openssl})
        {
                $libpq->RemoveFile('src/interfaces/libpq/fe-secure-common.c');
                $libpq->RemoveFile('src/interfaces/libpq/fe-secure-openssl.c');
-               $libpq->RemoveFile('src/common/sha2_openssl.c');
-       }
-       else
-       {
-               $libpq->RemoveFile('src/common/sha2.c');
        }
 
        my $libpqwalreceiver =