mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 18:52:46 +08:00
440075a9fc
* update to 14.1 * adjust patches * add lz4 feature on !windows * version stuff * [skip actions] patch configure.ac and run autoreconf * fix some stuff * [skip actions] more details * [libpq] Add license filed to vcpkg json * [libpq] Adjust tcl version to 90g 90s and 90sg * [libpq] fail early from unsupported features * [libpq] lake xslt dependent from xml * [libpq] Update version database * [libpq] quote static * [libpq] Update Version Database Co-authored-by: Alexander Neumann <Alexander.Neumann@hamburg.de>
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
|
|
@@ -16,7 +16,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);
|
|
@@ -52,7 +52,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
|
|
@@ -13,7 +13,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')
|
|
@@ -51,5 +51,5 @@ close($mf);
|
|
|
|
my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : "";
|
|
|
|
-system("bison $nodep $headerflag $input -o $output");
|
|
+system("win_bison $nodep $headerflag $input -o $output");
|
|
exit $? >> 8;
|
|
|