win toolchain: Always use ; for all env vars except PATH, even on non-Windows.

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.
 #
 # Copies the given "win tool" (which the toolchain uses to wrap compiler
 # invocations) and the environment blocks for the 32-bit and 64-bit builds on
 # Windows to the build directory.
 #
 # The arguments are the visual studio install location and the location of the
 # win tool. The script assumes that the root build directory is the current dir
@@ skipping 77 matching lines @@
   # the setup script from the SDK if so. |cpu| should be either
   # 'x86' or 'x64'.
   assert cpu in ('x86', 'x64')
   if bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', 1))) and sdk_dir:
     # Load environment from json file.
     env = os.path.normpath(os.path.join(sdk_dir, 'Bin/SetEnv.%s.json' % cpu))
     env = json.load(open(env))['env']
     for k in env:
       entries = [os.path.join(*([os.path.join(sdk_dir, 'bin')] + e))
                  for e in env[k]]
-      env[k] = os.pathsep.join(entries)
+      # clang-cl wants INCLUDE to be ;-separated even on non-Windows,
+      # lld-link wants LIB to be ;-separated even on non-Windows.  Path gets :.
+      # The separator for INCLUDE here must match the one used in main() below.
+      sep = os.pathsep if k == 'PATH' else ';'
+      env[k] = sep.join(entries)
     # PATH is a bit of a special case, it's in addition to the current PATH.
     env['PATH'] = env['PATH'] + os.pathsep + os.environ['PATH']
     # Augment with the current env to pick up TEMP and friends.
     for k in os.environ:
       if k not in env:
         env[k] = os.environ[k]
 
     varlines = []
     for k in sorted(env.keys()):
       varlines.append('%s=%s' % (str(k), str(env[k])))
@@ skipping 82 matching lines @@
   for cpu in cpus:
     # Extract environment variables for subprocesses.
     env = _LoadToolchainEnv(cpu, win_sdk_path)
     env['PATH'] = runtime_dirs + os.pathsep + env['PATH']
 
     if cpu == target_cpu:
       for path in env['PATH'].split(os.pathsep):
         if os.path.exists(os.path.join(path, 'cl.exe')):
           vc_bin_dir = os.path.realpath(path)
           break
+      # The separator for INCLUDE here must match the one used in
+      # _LoadToolchainEnv() above.
       include = ' '.join([include_prefix + p
                           for p in env['INCLUDE'].split(';')])
 
     env_block = _FormatAsEnvironmentBlock(env)
     with open('environment.' + cpu, 'wb') as f:
       f.write(env_block)
 
     # Create a store app version of the environment.
     if 'LIB' in env:
       env['LIB']     = env['LIB']    .replace(r'\VC\LIB', r'\VC\LIB\STORE')
     if 'LIBPATH' in env:
       env['LIBPATH'] = env['LIBPATH'].replace(r'\VC\LIB', r'\VC\LIB\STORE')
     env_block = _FormatAsEnvironmentBlock(env)
     with open('environment.winrt_' + cpu, 'wb') as f:
       f.write(env_block)
 
   assert vc_bin_dir
   assert '"' not in vc_bin_dir
   print 'vc_bin_dir = "%s"' % vc_bin_dir
   assert include
   assert '"' not in include
   print 'include_flags = "%s"' % include
 
 if __name__ == '__main__':
   main()