From cd0e8253216907982fe369b91f6d788d699b6c47 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Sun, 17 Oct 2010 16:36:54 +0200
Subject: [PATCH] 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.
---
src/tools/msvc/Solution.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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!";
}
--
GitLab