Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1115)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/win/copy_cdb_to_output.py

Issue 2030723002: Handle case where WINDOWSSDKDIR is not set (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing indentation Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..e9985de52968668a9b17118ba7754f69d274fbae 100755
--- a/build/win/copy_cdb_to_output.py
+++ b/build/win/copy_cdb_to_output.py
@@ -53,7 +53,11 @@ 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.
+ win_sdk_dir = os.path.normpath(
+ os.environ.get('WINDOWSSDKDIR',
+ 'C:\\Program Files (x86)\\Windows Kits\\10'))
if target_arch == 'ia32' or target_arch == 'x86':
src_arch = 'x86'
elif target_arch == 'x64':
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698