mirror of
https://github.com/postgres/postgres.git
synced 2025-07-08 11:42:09 +03:00
Make pg_dumpall build with the right object files under MSVC.
This fixes a longstanding but up to now benign bug in the way pg_dumpall was built. The bug was exposed by recent code adjustments. The Makefile does not use $(OBJS) to build pg_dumpall, so this fix removes their source files from the pg_dumpall object and adds in the one source file it consequently needs.
This commit is contained in:
@ -344,9 +344,17 @@ sub mkvcbuild
|
|||||||
$pgdump->AddFile('src\backend\parser\kwlookup.c');
|
$pgdump->AddFile('src\backend\parser\kwlookup.c');
|
||||||
|
|
||||||
my $pgdumpall = AddSimpleFrontend('pg_dump', 1);
|
my $pgdumpall = AddSimpleFrontend('pg_dump', 1);
|
||||||
|
# pg_dumpall doesn't use the files in the Makefile's $(OBJS), unlike
|
||||||
|
# pg_dump and pg_restore.
|
||||||
|
# So remove their sources from the object, keeping the other setup that
|
||||||
|
# AddSimpleFrontend() has done.
|
||||||
|
my @nodumpall = grep { m/src\\bin\\pg_dump\\.*\.c$/ }
|
||||||
|
keys %{$pgdumpall->{files}};
|
||||||
|
delete @{$pgdumpall->{files}}{@nodumpall};
|
||||||
$pgdumpall->{name} = 'pg_dumpall';
|
$pgdumpall->{name} = 'pg_dumpall';
|
||||||
$pgdumpall->AddIncludeDir('src\backend');
|
$pgdumpall->AddIncludeDir('src\backend');
|
||||||
$pgdumpall->AddFile('src\bin\pg_dump\pg_dumpall.c');
|
$pgdumpall->AddFile('src\bin\pg_dump\pg_dumpall.c');
|
||||||
|
$pgdumpall->AddFile('src\bin\pg_dump\dumputils.c');
|
||||||
$pgdumpall->AddFile('src\bin\pg_dump\keywords.c');
|
$pgdumpall->AddFile('src\bin\pg_dump\keywords.c');
|
||||||
$pgdumpall->AddFile('src\backend\parser\kwlookup.c');
|
$pgdumpall->AddFile('src\backend\parser\kwlookup.c');
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user