Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 326d73c

Browse files
committed
Second attempt at fixing MSVC build for 68ab8e8.
After the previous fix in 6f1f34c 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
1 parent b6afae7 commit 326d73c

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/tools/msvc/Mkvcbuild.pm

+6-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ my $frontend_extrasource = {
7171
'src/bin/psql/psqlscan.l' ] };
7272
my @frontend_excludes = (
7373
'pgevent', 'pg_basebackup', 'pg_rewind', 'pg_dump',
74-
'pg_xlogdump', 'scripts');
74+
'pg_xlogdump', 'scripts', 'pgbench');
7575

7676
sub mkvcbuild
7777
{
@@ -674,6 +674,11 @@ sub mkvcbuild
674674
}
675675
$pg_xlogdump->AddFile('src/backend/access/transam/xlogreader.c');
676676

677+
# fix up pgbench once it's been set up
678+
# we're borrowing psqlscan.c from psql, so grab it from the correct place
679+
my $pgbench = AddSimpleFrontend('pgbench');
680+
$pgbench->ReplaceFile('src/bin/pgbench/psqlscan.c', 'src/bin/psql/psqlscan.c');
681+
677682
$solution->Save();
678683
return $solution->{vcver};
679684
}

0 commit comments

Comments
 (0)