Exclude part of the product name string that is localized in Japanese versions

of MSVC when detecting MSVC version.

Hiroshi Inoue

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index ff82cb7685bc050ae5ea9e725b0dbcebb98645fa..c013390ab25e8e5c439e2c3a4c1a37bd83edc07c 100644 (file)
--- 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 \(R\) Visual C\+\+ Project Builder - Command Line Version (\d+)\.00\.\d+/) {
+    if ($line !~ /^Microsoft\s*\(R\) Visual C\+\+ Project Builder - \D+(\d+)\.00\.\d+/) {
        die "Unable to determine vcbuild version from first line of output!";
     }
     if ($1 == 8) { $self->{vcver} = '8.00' }