Index: build/toolchain/win/setup_toolchain.py |
diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py |
index df92f157ca8acbe9dcead4e2b0742f2adab1dad1..df4d712db3b980cbf18dfbd5b3a848109c01b67a 100644 |
--- a/build/toolchain/win/setup_toolchain.py |
+++ b/build/toolchain/win/setup_toolchain.py |
@@ -50,10 +50,11 @@ def _ExtractImportantEnvironment(output_of_set): |
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) |
+ if sys.platform in ('win32', 'cygwin'): |
+ 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 |
@@ -108,9 +109,10 @@ def _LoadToolchainEnv(cpu, sdk_dir): |
variables = '\n'.join(varlines) |
# Check that the json file contained the same environment as the .cmd file. |
- script = os.path.normpath(os.path.join(sdk_dir, 'Bin/SetEnv.cmd')) |
- assert _ExtractImportantEnvironment(variables) == \ |
- _ExtractImportantEnvironment(_LoadEnvFromBat([script, '/' + cpu])) |
+ if sys.platform in ('win32', 'cygwin'): |
+ script = os.path.normpath(os.path.join(sdk_dir, 'Bin/SetEnv.cmd')) |
+ assert _ExtractImportantEnvironment(variables) == \ |
+ _ExtractImportantEnvironment(_LoadEnvFromBat([script, '/' + cpu])) |
else: |
if 'GYP_MSVS_OVERRIDE_PATH' not in os.environ: |
os.environ['GYP_MSVS_OVERRIDE_PATH'] = _DetectVisualStudioPath() |
@@ -171,7 +173,7 @@ def main(): |
for cpu in cpus: |
# Extract environment variables for subprocesses. |
env = _LoadToolchainEnv(cpu, win_sdk_path) |
- env['PATH'] = runtime_dirs + os.path.pathsep + env['PATH'] |
+ env['PATH'] = runtime_dirs + os.pathsep + env['PATH'] |
if cpu == target_cpu: |
for path in env['PATH'].split(os.pathsep): |
@@ -186,11 +188,12 @@ def main(): |
# long and be sure to make corresponding changes to build\common.gypi. |
# Not currently used. |
#if win_sdk_path: |
scottmg
2016/03/21 17:30:14
I'm not sure why this is here, probably just nuke
Nico
2016/03/21 17:33:54
I asked here: https://codereview.chromium.org/1783
|
+ # # INCLUDE always uses ; separators, even on non-Windows. |
# additional_includes = [ |
# os.path.join(win_sdk_path, 'Include', '10.0.10586.0', p) |
# for p in ['shared', 'um', 'winrt']] |
- # additional_includes = os.path.pathsep.join(additional_includes) |
- # env['INCLUDE'] = additional_includes + os.path.pathsep + env['INCLUDE'] |
+ # additional_includes = ';'.join(additional_includes) |
+ # env['INCLUDE'] = additional_includes + ';' + env['INCLUDE'] |
env_block = _FormatAsEnvironmentBlock(env) |
with open('environment.' + cpu, 'wb') as f: |
f.write(env_block) |