Don't use automatic toolchain if GYP_MSVS_VERSION overridden to another version

build/gyp_chromium

Index: build/gyp_chromium
diff --git a/build/gyp_chromium b/build/gyp_chromium
index ae1d4c2f66242d7c883b990078479bfd92f86836..b3e8d616fc8f8eec9041e3c08dd0fadbfaa44a56 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -442,7 +442,11 @@ if __name__ == '__main__':
   # If on windows, and the automatic toolchain has been installed by
   # depot_tools, then use it.
   vs2013_runtime_dll_dirs = None
-  if sys.platform in ('win32', 'cygwin'):
+  # If MSVS_VERSION is explicitly specified to be something other than 2013,
+  # don't use the automatic toolchain, as it currently only supports VS2013.
+  gyp_msvs_version = os.environ.get('GYP_MSVS_VERSION')

[M-A Ruel, 2014/02/21 13:20:55]

gyp_msvs_version = os.environ.get('GYP_MSVS_VERSION', '2013')

[scottmg, 2014/02/21 16:52:23]

Done.

+  if (sys.platform in ('win32', 'cygwin') and
+      (not gyp_msvs_version or gyp_msvs_version.startswith('2013'))):

[M-A Ruel, 2014/02/21 13:20:55]

you can remove the not gyp_msvs_version this way.

[scottmg, 2014/02/21 16:52:23]

Done.

     depot_tools_path = find_depot_tools.add_depot_tools_to_path()
     toolchain = os.path.normpath(os.path.join(
         depot_tools_path, 'win_toolchain', 'vs2013_files'))