mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-05 19:09:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unbreak MSVC builds after recent Makefile refactoring.

Browse Source 
Based on a suggestion by Peter Eisentraut.
This commit is contained in:
Andrew Dunstan 2012-10-11 12:36:42 -04:00
parent 4816d2ea32
commit e583ffe947
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/msvc/pgbison.pl
View File

@ -42,7 +42,8 @@ open($mf, $makefile);
local $/ = undef; local $/ = undef;
$make = <$mf>; $make = <$mf>;
close($mf); close($mf);
my $headerflag = ($make =~ /\$\(BISON\)\s+-d/ ? '-d' : ''); my $basetarg = basename($output);
my $headerflag = ($make =~ /^$basetarg:\s+BISONFLAGS\b.*-d/m ? '-d' : '');
system("bison $headerflag $input -o $output"); system("bison $headerflag $input -o $output");
exit $? >> 8; exit $? >> 8;

3
src/tools/msvc/pgflex.pl
View File

@ -44,7 +44,8 @@ open($mf, $makefile);
local $/ = undef; local $/ = undef;
$make = <$mf>; $make = <$mf>;
close($mf); close($mf);
my $flexflags = ($make =~ /^\s*FLEXFLAGS\s*=\s*(\S.*)/m ? $1 : ''); my $basetarg = basename($output);
my $flexflags = ($make =~ /^$basetarg:\s*FLEXFLAGS\s*=\s*(\S.*)/m ? $1 : '');
system("flex $flexflags -o$output $input"); system("flex $flexflags -o$output $input");
if ($? == 0) if ($? == 0)