mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-25 15:40:25 +08:00
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
|
diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl
|
||
|
|
index aceed5ffd..f6ed215e8 100644
|
||
|
|
--- a/src/tools/msvc/pgflex.pl
|
||
|
|
+++ b/src/tools/msvc/pgflex.pl
|
||
|
|
@@ -12,7 +12,7 @@ $ENV{CYGWIN} = 'nodosfilewarning';
|
||
|
|
|
||
|
|
do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl';
|
||
|
|
|
||
|
|
-my ($flexver) = `flex -V`; # grab first line
|
||
|
|
+my ($flexver) = `win_flex -V`; # grab first line
|
||
|
|
$flexver = (split(/\s+/, $flexver))[1];
|
||
|
|
$flexver =~ s/[^0-9.]//g;
|
||
|
|
my @verparts = split(/\./, $flexver);
|
||
|
|
@@ -48,7 +47,7 @@ close($mf);
|
||
|
|
my $basetarg = basename($output);
|
||
|
|
my $flexflags = ($make =~ /^$basetarg:\s*FLEXFLAGS\s*=\s*(\S.*)/m ? $1 : '');
|
||
|
|
|
||
|
|
-system("flex $flexflags -o$output $input");
|
||
|
|
+system("win_flex $flexflags -o$output $input");
|
||
|
|
if ($? == 0)
|
||
|
|
{
|
||
|
|
|
||
|
|
diff --git a/src/tools/msvc/pgbison.pl b/src/tools/msvc/pgbison.pl
|
||
|
|
index 895e398c0..f5b524a5d 100644
|
||
|
|
--- a/src/tools/msvc/pgbison.pl
|
||
|
|
+++ b/src/tools/msvc/pgbison.pl
|
||
|
|
@@ -9,7 +9,7 @@ use File::Basename;
|
||
|
|
|
||
|
|
do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl';
|
||
|
|
|
||
|
|
-my ($bisonver) = `bison -V`; # grab first line
|
||
|
|
+my ($bisonver) = `win_bison -V`; # grab first line
|
||
|
|
$bisonver = (split(/\s+/, $bisonver))[3]; # grab version number
|
||
|
|
|
||
|
|
unless ($bisonver eq '1.875' || $bisonver ge '2.2')
|
||
|
|
@@ -45,5 +45,5 @@ close($mf);
|
||
|
|
my $basetarg = basename($output);
|
||
|
|
my $headerflag = ($make =~ /^$basetarg:\s+BISONFLAGS\b.*-d/m ? '-d' : '');
|
||
|
|
|
||
|
|
-system("bison $headerflag $input -o $output");
|
||
|
|
+system("win_bison $headerflag $input -o $output");
|
||
|
|
exit $? >> 8;
|
||
|
|
|