database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-09 18:21:05 +03:00
Code

Tweak MSVC build system to match changes in 7143b3e82.

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

Per buildfarm.
This commit is contained in:
Tom Lane 2018-09-28 15:17:07 -04:00
parent 7143b3e821
commit 97c6852ff7
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/interfaces/libpq/Makefile
View File

@ -24,8 +24,9 @@ ifneq ($(PORTNAME), win32)
override CFLAGS += $(PTHREAD_CFLAGS) override CFLAGS += $(PTHREAD_CFLAGS)
endif endif
# We can't use Makefile variables here because the MSVC build system scrapes # The MSVC build system scrapes OBJS from this file. If you change any of
# OBJS from this file. # 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 \ 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 \ fe-protocol2.o fe-protocol3.o pqexpbuffer.o fe-secure.o \
libpq-events.o libpq-events.o

14
src/tools/msvc/Mkvcbuild.pm
View File

@ -182,8 +182,8 @@ sub mkvcbuild
$postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap}); $postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap});
$postgres->FullExportDLL('postgres.lib'); $postgres->FullExportDLL('postgres.lib');
# The OBJS scraper doesn't know about ifdefs, so remove be-secure-openssl.c # The OBJS scraper doesn't know about ifdefs, so remove appropriate files
# if building without OpenSSL # if building without OpenSSL.
if (!$solution->{options}->{openssl}) if (!$solution->{options}->{openssl})
{ {
$postgres->RemoveFile('src/backend/libpq/be-secure-common.c'); $postgres->RemoveFile('src/backend/libpq/be-secure-common.c');
@ -242,18 +242,12 @@ sub mkvcbuild
'src/interfaces/libpq/libpq.rc'); 'src/interfaces/libpq/libpq.rc');
$libpq->AddReference($libpgport); $libpq->AddReference($libpgport);
# The OBJS scraper doesn't know about ifdefs, so remove fe-secure-openssl.c # The OBJS scraper doesn't know about ifdefs, so remove appropriate files
# and sha2_openssl.c if building without OpenSSL, and remove sha2.c if # if building without OpenSSL.
# building with OpenSSL.
if (!$solution->{options}->{openssl}) if (!$solution->{options}->{openssl})
{ {
$libpq->RemoveFile('src/interfaces/libpq/fe-secure-common.c'); $libpq->RemoveFile('src/interfaces/libpq/fe-secure-common.c');
$libpq->RemoveFile('src/interfaces/libpq/fe-secure-openssl.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 = my $libpqwalreceiver =