mirror of https://github.com/postgres/postgres
Use a slightly more liberal regex to detect Visual Studio version
Apparently in some language versions of Visual Studio nmake outputs some material after the version number and before the end of the line. This has been seen in Chinese versions. Therefore, we no longer demand that the version string comes at the end of a line. Per complaint from Cuiping Lin. Backpatch to all live branches.
This commit is contained in:
parent
46b1b6379a
commit
3ca17999f6
|
@ -150,7 +150,7 @@ sub DetermineVisualStudioVersion
|
||||||
$? >> 8 == 0
|
$? >> 8 == 0
|
||||||
or croak
|
or croak
|
||||||
"Unable to determine Visual Studio version: The nmake command wasn't found.";
|
"Unable to determine Visual Studio version: The nmake command wasn't found.";
|
||||||
if ($output =~ /(\d+)\.(\d+)\.\d+(\.\d+)?$/m)
|
if ($output =~ /(\d+)\.(\d+)\.\d+(\.\d+)?/)
|
||||||
{
|
{
|
||||||
return _GetVisualStudioVersion($1, $2);
|
return _GetVisualStudioVersion($1, $2);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue