build/toolchain/win/setup_toolchain.py - Issue 812543002: Update from https://crrev.com/308331

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/toolchain/win/setup_toolchain.py

Issue 812543002: Update from https://crrev.com/308331 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/toolchain/win/setup_toolchain.py

diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py

index 6b7ea7a5116f8fcf38064f3dd73e320144cbf60b..e8826b0b821b0a28c59524a84ffacc9e3534f826 100644

--- a/build/toolchain/win/setup_toolchain.py

+++ b/build/toolchain/win/setup_toolchain.py

@@ -67,7 +67,8 @@ def _SetupScript(target_arch, sdk_dir):

# 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')),

+ return [os.path.normpath(os.path.join(os.environ['GYP_MSVS_OVERRIDE_PATH'],

+ 'VC/vcvarsall.bat')),

'amd64_x86' if target_arch == 'x86' else 'amd64']

« no previous file with comments | « build/toolchain/OWNERS ('k') | build/vs_toolchain.py » ('j') | no next file with comments »