build/common.gypi - Issue 58373003: Fix iOS device builds broken by commit d645540

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/common.gypi

Issue 58373003: Fix iOS device builds broken by commit d645540 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 1 month 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/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index a33064df2982f6d4953aadb3e25592a1e5231cc3..7e498acb9399d019fb039bf5c4a21076404e217c 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -4664,7 +4664,10 @@

'x86_64'

}],

- ['target_arch=="ia32"', {

+ # Mac builds set ARCHS explicitly to i386. Leave ARCHS unspecified for

+ # iOS builds, so that Xcode will use the appropriate defaults for

+ # simulator and device builds, which are different architectures.

+ ['target_arch=="ia32" and OS!="ios"', {

'ARCHS': [

'i386'

« no previous file with comments | « base/memory/discardable_memory_provider_unittest.cc ('k') | no next file » | no next file with comments »