build/config/BUILDCONFIG.gn - Issue 1158763006: clang/win: Start work on getting clang/win working in gn.

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/config/BUILDCONFIG.gn

Issue 1158763006: clang/win: Start work on getting clang/win working in gn. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: comment Created 5 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

Index: build/config/BUILDCONFIG.gn

diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn

index deec5a1c1034ad413d2d39b349e67a076679a968..606a229dad03c9a0bb68b959b4fc563d22f4ac28 100644

--- a/build/config/BUILDCONFIG.gn

+++ b/build/config/BUILDCONFIG.gn

@@ -524,11 +524,10 @@ set_defaults("test") {

if (is_win) {

# On windows we use the same toolchain for host and target by default.

- # TODO(dpranke): rename the toolchains to x64 and x86 to match current_cpu.

- if (current_cpu == "x64") {

- host_toolchain = "//build/toolchain/win:64"

- } else if (current_cpu == "x86") {

- host_toolchain = "//build/toolchain/win:32"

+ if (is_clang) {

+ host_toolchain = "//build/toolchain/win:clang_$current_cpu"

+ } else {

+ host_toolchain = "//build/toolchain/win:$current_cpu"

}

set_default_toolchain("$host_toolchain")

} else if (is_android) {

« no previous file with comments | « build/common.gypi ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »