diff options
| author | Magnus Hagander <magnus@hagander.net> | 2010-10-17 16:36:54 +0200 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2010-10-17 16:36:54 +0200 |
| commit | cd0e8253216907982fe369b91f6d788d699b6c47 (patch) | |
| tree | 287dd83e7b10109f886d723e10ab3dd13675bad6 /src | |
| parent | 9771125c18c5746be57a55cfc31340f5311fca2c (diff) | |
| download | postgresql-cd0e8253216907982fe369b91f6d788d699b6c47.tar.gz postgresql-cd0e8253216907982fe369b91f6d788d699b6c47.zip | |
Fix msvc build for localized versions of Visual C++
Look only at the non-localized part of the output from "vcbuild /?",
which is used to determine the version of Visual Studio in use. Different
languages seem to localize different amounts of the string, but we assume
the part "Microsoft Visual C++" won't be modified.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/msvc/Solution.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index a3eaefe1c7a..b737e1ed9fc 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -66,7 +66,7 @@ sub DetermineToolVersions open(P,"vcbuild /? |") || die "vcbuild command not found"; my $line = <P>; close(P); - if ($line !~ /^Microsoft\s*\(R\) Visual C\+\+ Project Builder - \D+(\d+)\.00\.\d+/) + if ($line !~ /^Microsoft\s*\(R\) Visual C\+\+ [^-]+ - \D+(\d+)\.00\.\d+/) { die "Unable to determine vcbuild version from first line of output!"; } |