build/toolchain/win/setup_toolchain.py - Issue 2046633005: setup_toolchain.py: Fix the path to win_sdk/bin/SetEnv*.json

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 2046633005: setup_toolchain.py: Fix the path to win_sdk/bin/SetEnv*.json (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

Index: build/toolchain/win/setup_toolchain.py

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

index aed7e98eaacdd20de1dc20889983c8bcb187f6cd..d58cb8536335647195f2945001993ade05fbd9de 100644

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

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

@@ -90,7 +90,7 @@ def _LoadToolchainEnv(cpu, sdk_dir):

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 = 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))

« no previous file with comments | « no previous file | no next file » | no next file with comments »