mirror of
https://github.com/postgres/postgres.git
synced 2025-06-10 09:21:54 +03:00
Second attempt at fixing MSVC build for 68ab8e8ba4
.
After the previous fix in 6f1f34c9
msvc ended up looking for psqlscan.c
in the wrong directory.
David's fix just forces the path to be adjusted. That's not a
particularly pretty fix, but it hopefully will make the buildfarm green
again.
Author: David Rowley
Discussion: CAKJS1f_9CCi_t+LEgV5GWoCj3wjavcMoDc5qfcf_A0UwpQoPoA@mail.gmail.com
This commit is contained in:
@ -71,7 +71,7 @@ my $frontend_extrasource = {
|
|||||||
'src/bin/psql/psqlscan.l' ] };
|
'src/bin/psql/psqlscan.l' ] };
|
||||||
my @frontend_excludes = (
|
my @frontend_excludes = (
|
||||||
'pgevent', 'pg_basebackup', 'pg_rewind', 'pg_dump',
|
'pgevent', 'pg_basebackup', 'pg_rewind', 'pg_dump',
|
||||||
'pg_xlogdump', 'scripts');
|
'pg_xlogdump', 'scripts', 'pgbench');
|
||||||
|
|
||||||
sub mkvcbuild
|
sub mkvcbuild
|
||||||
{
|
{
|
||||||
@ -674,6 +674,11 @@ sub mkvcbuild
|
|||||||
}
|
}
|
||||||
$pg_xlogdump->AddFile('src/backend/access/transam/xlogreader.c');
|
$pg_xlogdump->AddFile('src/backend/access/transam/xlogreader.c');
|
||||||
|
|
||||||
|
# fix up pgbench once it's been set up
|
||||||
|
# we're borrowing psqlscan.c from psql, so grab it from the correct place
|
||||||
|
my $pgbench = AddSimpleFrontend('pgbench');
|
||||||
|
$pgbench->ReplaceFile('src/bin/pgbench/psqlscan.c', 'src/bin/psql/psqlscan.c');
|
||||||
|
|
||||||
$solution->Save();
|
$solution->Save();
|
||||||
return $solution->{vcver};
|
return $solution->{vcver};
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user