build/config/mac/BUILD.gn - Issue 1810423002: [iOS/GN] Fix compilation of ios_chrome_unittests with 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/mac/BUILD.gn

Issue 1810423002: [iOS/GN] Fix compilation of ios_chrome_unittests with gn. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@resources

Patch Set: Fix link error Created 4 years, 9 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/mac/BUILD.gn

diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn

index af1fbbc092b050f00ac80637df0d2ecc688ebd28..56e101cee713f3350170e5aeb007afe882bab157 100644

--- a/build/config/mac/BUILD.gn

+++ b/build/config/mac/BUILD.gn

@@ -24,16 +24,16 @@ config("compiler") {

"-arch",

"i386",

]

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

- # TODO(GYP): we may need to distinguish between "arm64", "armv7",

- # and "armv7s" for iOS, and hence need multiple current_cpu values

- # rather than just "arm".

+ } else if (current_cpu == "armv7" || current_cpu == "arm") {

common_mac_flags += [

"-arch",

- "arm64",

- "-arch",

"armv7",

]

+ } else if (current_cpu == "arm64") {

+ common_mac_flags += [

+ "-arch",

+ "arm64",

+ ]

}

asmflags = common_mac_flags

« no previous file with comments | « build/config/arm.gni ('k') | build/toolchain/mac/BUILD.gn » ('j') | no next file with comments »