Make goma work on win GN builds.

build/toolchain/win/setup_toolchain.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import errno
 import os
 import re
 import subprocess
 import sys
 
@@ skipping 35 matching lines @@
           setting = os.path.dirname(sys.executable) + os.pathsep + setting
         env[var.upper()] = setting
         break
   for required in ('SYSTEMROOT', 'TEMP', 'TMP'):
     if required not in env:
       raise Exception('Environment variable "%s" '
                       'required to be set to valid path' % required)
   return env
 
 
-def _SetupScript(target_arch, sdk_dir):
+def _SetupScript(target_arch, sdk_dir, vc_bin_subdir):
   """Returns a command (with arguments) to be used to set up the
   environment."""
   # Check if we are running in the SDK command line environment and use
   # the setup script from the SDK if so. |target_arch| should be either
   # 'x86' or 'x64'.
   assert target_arch in ('x86', 'x64')
   if bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', 1))) and sdk_dir:
     return [os.path.normpath(os.path.join(sdk_dir, 'Bin/SetEnv.Cmd')),
             '/' + target_arch]
   else:
     # We only support x64-hosted tools.
     # TODO(scottmg|dpranke): Non-depot_tools toolchain: need to get Visual
     # Studio install location from registry.
     return [os.path.normpath(os.path.join(FIND_VS_IN_REG, 'VC/vcvarsall.bat')),
-            'amd64_x86' if target_arch == 'x86' else 'amd64']
+            vc_bin_subdir]
 
 
 def _FormatAsEnvironmentBlock(envvar_dict):
   """Format as an 'environment block' directly suitable for CreateProcess.
   Briefly this is a list of key=value\0, terminated by an additional \0. See
   CreateProcess documentation for more details."""
   block = ''
   nul = '\0'
   for key, value in envvar_dict.iteritems():
     block += key + '=' + value + nul
   block += nul
   return block
 
 
 def _CopyTool(source_path):
   """Copies the given tool to the current directory, including a warning not
   to edit it."""
   with open(source_path) as source_file:
     tool_source = source_file.readlines()
 
   # Add header and write it out to the current directory (which should be the
   # root build dir).
   with open("gyp-win-tool", 'w') as tool_file:
     tool_file.write(''.join([tool_source[0],
                              '# Generated by setup_toolchain.py do not edit.\n']
                             + tool_source[1:]))
 
 
 def main():
-  if len(sys.argv) != 5:
+  if len(sys.argv) != 6:
     print('Usage setup_toolchain.py '
-          '<visual studio path> <win tool path> <win sdk path> <runtime dirs>')
+          '<visual studio path> <win tool path> <win sdk path> '
+          '<runtime dirs> <cpu_arch>')
     sys.exit(2)
   vs_path = sys.argv[1]
   tool_source = sys.argv[2]
   win_sdk_path = sys.argv[3]
   runtime_dirs = sys.argv[4]
+  cpu_arch = sys.argv[5]
 
   _CopyTool(tool_source)
 
   archs = ('x86', 'x64')
+  assert cpu_arch in archs
+  vc_bin_subdir = 'amd64_x86' if cpu_arch == 'x86' else 'amd64'

[scottmg, 2014/11/21 22:26:59]

i guess that's ok :) at least it's all in this script now. the code that's
actually executing (DEPOT_TOOLS_WIN_TOOLCHAIN defaults to 1) isn't using this,
so it's still sort of in two places.

+
   # TODO(scottmg|goma): Do we need an equivalent of
   # ninja_use_custom_environment_files?
   for arch in archs:
     # Extract environment variables for subprocesses.
-    args = _SetupScript(arch, win_sdk_path)
+    args = _SetupScript(arch, win_sdk_path, vc_bin_subdir)
     args.extend(('&&', 'set'))
     popen = subprocess.Popen(
         args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     variables, _ = popen.communicate()
     env = _ExtractImportantEnvironment(variables)
     env['PATH'] = runtime_dirs + ';' + env['PATH']
 
     # TODO(scottmg|thakis|dpranke): Is there an equivalent to
     # msvs_system_include_dirs that we need to inject into INCLUDE here?
 
     env_block = _FormatAsEnvironmentBlock(env)
     with open('environment.' + arch, 'wb') as f:
       f.write(env_block)
 
+  print 'vc_bin_dir = "%s"' % os.path.join(vs_path, 'VC', 'bin', vc_bin_subdir)
+
 
 if __name__ == '__main__':
   main()