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.
This commit is contained in:
Magnus Hagander 2010-10-17 16:36:54 +02:00
parent 9771125c18
commit cd0e825321

View File

@ -66,7 +66,7 @@ sub DetermineToolVersions
open(P,"vcbuild /? |") || die "vcbuild command not found"; open(P,"vcbuild /? |") || die "vcbuild command not found";
my $line = <P>; my $line = <P>;
close(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!"; die "Unable to determine vcbuild version from first line of output!";
} }