Bug 1627163 - Avoid a comparison between a str and an int in gyp. r=firefox-build-system-reviewers,rstewart

Python 3 doesn't like that.

Differential Revision: https://phabricator.services.mozilla.com/D69537

--HG--
extra : moz-landing-system : lando

python/mozbuild/mozbuild/frontend/gyp_reader.py

@@ -251,6 +251,9 @@ def process_gyp_result(gyp_result, gyp_dir_attrs, path, config, output,
             defines = target_conf.get('defines', [])
             if config.substs['CC_TYPE'] == 'clang-cl' and no_chromium:
                 msvs_settings = gyp.msvs_emulation.MsvsSettings(spec, {})
+                # Hack: MsvsSettings._TargetConfig tries to compare a str to an int,
+                # so convert manually.
+                msvs_settings.vs_version.short_name = int(msvs_settings.vs_version.short_name)
                 defines.extend(msvs_settings.GetComputedDefines(c))
             for define in defines:
                 if '=' in define: