build/vs_toolchain.py - Issue 1582173003: Update the toolchain if there's a mismatch between the env and win_toolchain.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/vs_toolchain.py

Issue 1582173003: Update the toolchain if there's a mismatch between the env and win_toolchain.json (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/vs_toolchain.py

diff --git a/build/vs_toolchain.py b/build/vs_toolchain.py

index ed0042b8786d3135becb310bc2478ef05c5078f7..7179d86fb6b645c2cdf51ad57223d650bb1e0b79 100755

--- a/build/vs_toolchain.py

+++ b/build/vs_toolchain.py

@@ -50,7 +50,11 @@ def SetEnvironmentAndGetRuntimeDllDirs():

vs_runtime_dll_dirs = toolchain_data['runtime_dirs']

os.environ['GYP_MSVS_OVERRIDE_PATH'] = toolchain

- os.environ['GYP_MSVS_VERSION'] = version

+ if os.getenv('GYP_MSVS_VERSION'):

+ print ('Using the GYP_MSVS_VERSION value from the environment (%d).' %

+ os.getenv('GYP_MSVS_VERSION'))

+ else:

+ os.environ['GYP_MSVS_VERSION'] = version

# We need to make sure windows_sdk_path is set to the automated

# toolchain values in GYP_DEFINES, but don't want to override any

# otheroptions.express

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