database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-08 22:02:03 +03:00
Code

Second attempt at fixing MSVC build for 68ab8e8ba4a471d9.

Browse Source 
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:
Andres Freund 2016-03-21 10:49:45 +01:00
parent b6afae71aa
commit 326d73c86f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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};
} }