build/config/BUILDCONFIG.gn - Issue 1258923012: GN (Android): Make is_clang work for (at least for arm32)

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 1258923012: GN (Android): Make is_clang work for (at least for arm32) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix nacl build errors Created 5 years, 4 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 a71b4e2bd1334ea8427d0d8f93f3e36770259288..40f93dadea70586f0b0e514afa0dea18a4e56779 100644

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

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

@@ -574,7 +574,11 @@ if (is_win) {

} else {

assert(false, "Unknown host for android cross compile")

}

- set_default_toolchain("//build/toolchain/android:$current_cpu")

+ if (is_clang) {

+ set_default_toolchain("//build/toolchain/android:clang_$current_cpu")

+ } else {

+ set_default_toolchain("//build/toolchain/android:$current_cpu")

+ }

} else if (is_linux) {

if (is_clang) {

host_toolchain = "//build/toolchain/linux:clang_$host_cpu"

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