build/config/BUILDCONFIG.gn - Issue 877553008: Land prep work to enable NaCl in the Linux x64 GN builds.

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 877553008: Land prep work to enable NaCl in the Linux x64 GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: yet more feedback Created 5 years, 10 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 a554f12dc5b427ddbff8a0fff1116eb9bc6cbbdd..7c06e5934c8c53a569df09179c8bfa5f0cd62ac5 100644

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

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

@@ -548,6 +548,12 @@ if (is_win) {

} else if (is_ios) {

host_toolchain = "//build/toolchain/mac:host_clang"

set_default_toolchain("//build/toolchain/mac:clang")

+} else if (is_nacl) {

+ # TODO(GYP): This will need to change when we get NaCl working

+ # on multiple platforms, but this whole block of code (how we define

+ # host_toolchain) needs to be reworked regardless to key off of build_os

+ # and build_cpu_arch rather than the is_* variables.

+ host_toolchain = "//build/toolchain/linux:clang_x64"

}

# ==============================================================================

« no previous file with comments | « base/third_party/dynamic_annotations/BUILD.gn ('k') | build/config/features.gni » ('j') | no next file with comments »