Handle case where WINDOWSSDKDIR is not set

build/win/copy_cdb_to_output.py

Index: build/win/copy_cdb_to_output.py
diff --git a/build/win/copy_cdb_to_output.py b/build/win/copy_cdb_to_output.py
index 1354336f07a5fdc400173aba8286c9569bb15a4b..ed899edc4dadf64efa3a22fb808d184d30e9033c 100755
--- a/build/win/copy_cdb_to_output.py
+++ b/build/win/copy_cdb_to_output.py
@@ -53,7 +53,12 @@ def _CopyCDBToOutput(output_dir, target_arch):
   if not os.path.isdir(output_dir):
     os.makedirs(output_dir)
   vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
-  win_sdk_dir = os.path.normpath(os.environ['WINDOWSSDKDIR'])
+  # If WINDOWSSDKDIR is not set use the default SDK path. This will be the case
+  # when DEPOT_TOOLS_WIN_TOOLCHAIN=0 and vcvarsall.bat has not been run.
+  if not 'WINDOWSSDKDIR' in os.environ:
+    win_sdk_dir = 'C:\\Program Files (x86)\\Windows Kits\\10'
+  else:
+    win_sdk_dir = os.path.normpath(os.environ['WINDOWSSDKDIR'])

[scottmg, 2016/06/01 21:07:35]

replace the if/else with os.path.normpath(os.environ.get('WINDOWSSDKDIR',
'C:\\Program Files...'))

[brucedawson, 2016/06/01 22:24:07]

Done.

   if target_arch == 'ia32' or target_arch == 'x86':
     src_arch = 'x86'
   elif target_arch == 'x64':