build/toolchain/win/setup_toolchain.py - Issue 1615603002: Fix gn builds with locally installed VS

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 1615603002: Fix gn builds with locally installed VS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Tweaked comments and removed test code 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:

Index: build/toolchain/win/setup_toolchain.py

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

index d2dc4609644fe9862901e8938b8c590bc54eace0..dcb09bb96f93473ebde586673cbc4135b73069f0 100644

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

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

@@ -153,11 +153,13 @@ def main():

# The Windows SDK include directories must be first. They both have a sal.h,

# and the SDK one is newer and the SDK uses some newer features from it not

# present in the Visual Studio one.

+ # Having the Windows SDK first is also the only way to control which SDK

+ # version is used.

if win_sdk_path:

- additional_includes = ('{sdk_dir}\\Include\\shared;' +

- '{sdk_dir}\\Include\\um;' +

- '{sdk_dir}\\Include\\winrt;').format(

+ additional_includes = ('{sdk_dir}\\Include\\10.0.10586.0\\shared;' +

+ '{sdk_dir}\\Include\\10.0.10586.0\\um;' +

+ '{sdk_dir}\\Include\\10.0.10586.0\\winrt;').format(

sdk_dir=win_sdk_path)

env['INCLUDE'] = additional_includes + env['INCLUDE']

env_block = _FormatAsEnvironmentBlock(env)

« no previous file with comments | « build/config/win/visual_studio_version.gni ('k') | build/vs_toolchain.py » ('j') | no next file with comments »