summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander2010-10-17 14:36:54 +0000
committerMagnus Hagander2010-10-17 14:36:54 +0000
commitcd0e8253216907982fe369b91f6d788d699b6c47 (patch)
tree287dd83e7b10109f886d723e10ab3dd13675bad6
parent9771125c18c5746be57a55cfc31340f5311fca2c (diff)
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.
-rw-r--r--src/tools/msvc/Solution.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index a3eaefe1c7..b737e1ed9f 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!";
}