Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit97c6852

Browse files
committed
Tweak MSVC build system to match changes in7143b3e.
Also try to make the comment suggesting that this might be neededmore intelligible.Per buildfarm.
1 parent7143b3e commit97c6852

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

‎src/interfaces/libpq/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ ifneq ($(PORTNAME), win32)
2424
overrideCFLAGS +=$(PTHREAD_CFLAGS)
2525
endif
2626

27-
# We can't use Makefile variables here because the MSVC build system scrapes
28-
# OBJS from this file.
27+
# The MSVC build system scrapes OBJS from this file. If you change any of
28+
# the conditional additions of files to OBJS, update Mkvcbuild.pm to match.
29+
2930
OBJS=fe-auth.o fe-auth-scram.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o\
3031
fe-protocol2.o fe-protocol3.o pqexpbuffer.o fe-secure.o\
3132
libpq-events.o

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ sub mkvcbuild
182182
$postgres->AddLibrary('wldap32.lib')if ($solution->{options}->{ldap});
183183
$postgres->FullExportDLL('postgres.lib');
184184

185-
# The OBJS scraper doesn't know about ifdefs, so removebe-secure-openssl.c
186-
# if building without OpenSSL
185+
# The OBJS scraper doesn't know about ifdefs, so removeappropriate files
186+
# if building without OpenSSL.
187187
if (!$solution->{options}->{openssl})
188188
{
189189
$postgres->RemoveFile('src/backend/libpq/be-secure-common.c');
@@ -242,18 +242,12 @@ sub mkvcbuild
242242
'src/interfaces/libpq/libpq.rc');
243243
$libpq->AddReference($libpgport);
244244

245-
# The OBJS scraper doesn't know about ifdefs, so remove fe-secure-openssl.c
246-
# and sha2_openssl.c if building without OpenSSL, and remove sha2.c if
247-
# building with OpenSSL.
245+
# The OBJS scraper doesn't know about ifdefs, so remove appropriate files
246+
# if building without OpenSSL.
248247
if (!$solution->{options}->{openssl})
249248
{
250249
$libpq->RemoveFile('src/interfaces/libpq/fe-secure-common.c');
251250
$libpq->RemoveFile('src/interfaces/libpq/fe-secure-openssl.c');
252-
$libpq->RemoveFile('src/common/sha2_openssl.c');
253-
}
254-
else
255-
{
256-
$libpq->RemoveFile('src/common/sha2.c');
257251
}
258252

259253
my$libpqwalreceiver =

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp