BUG #16825: When building on Windows, cl /? retrun 'x64' not AMD64 and the build does not create x64 environment

The following bug has been logged on the website:

Bug reference: 16825
Logged by: Robert Grange
Email address: robionekenobi(at)bluewin(dot)ch
PostgreSQL version: 13.1
Operating system: Windows
Description:

Hi,

in src\tools\msvc\Solution.pm the following test is not sufficient
$self->{platform} =
($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32';
because the cl /? returns:
Microsoft (R) C/C++ Optimizing Compiler Version 19.28.29336 for x64
Copyright (C) Microsoft Corporation. All rights reserved.

better to check like this ?
$self->{platform} =
($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : ($output =~ /.x64$/m) ?
'x64' : 'Win32';

Regards
Robert