Commit97c6852

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 commit97c6852Copy full SHA for 97c6852

File tree

-12

lines changed

-12

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,9 @@ ifneq ($(PORTNAME), win32)`
`24`	`24`	`overrideCFLAGS +=$(PTHREAD_CFLAGS)`
`25`	`25`	`endif`
`26`	`26`
`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`	`+`
`29`	`30`	`OBJS=fe-auth.o fe-auth-scram.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o\`
`30`	`31`	`fe-protocol2.o fe-protocol3.o pqexpbuffer.o fe-secure.o\`
`31`	`32`	`libpq-events.o`

Lines changed: 4 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,8 @@ sub mkvcbuild`
`182`	`182`	`$postgres->AddLibrary('wldap32.lib')if ($solution->{options}->{ldap});`
`183`	`183`	`$postgres->FullExportDLL('postgres.lib');`
`184`	`184`
`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.`
`187`	`187`	`if (!$solution->{options}->{openssl})`
`188`	`188`	`{`
`189`	`189`	`$postgres->RemoveFile('src/backend/libpq/be-secure-common.c');`
`@@ -242,18 +242,12 @@ sub mkvcbuild`
`242`	`242`	`'src/interfaces/libpq/libpq.rc');`
`243`	`243`	`$libpq->AddReference($libpgport);`
`244`	`244`
`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.`
`248`	`247`	`if (!$solution->{options}->{openssl})`
`249`	`248`	`{`
`250`	`249`	`$libpq->RemoveFile('src/interfaces/libpq/fe-secure-common.c');`
`251`	`250`	`$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');`
`257`	`251`	`}`
`258`	`252`
`259`	`253`	`my$libpqwalreceiver =`

Comments

(0)