Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: build/common.gypi

Issue 14597007: Support target/host architecture with ninja iOS builds (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 8 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/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index cf259c31818fd593dc1bd2f313690a3916e71927..8bc82d4e893919d120db00439a02b908da76d228 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4030,6 +4030,17 @@
],
},
'target_conditions': [
+ ['_toolset=="host"', {
+ 'xcode_settings': {
+ 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot
+ 'MACOSX_DEPLOYMENT_TARGET': "10.6",
stuartmorgan 2013/05/06 11:56:35 This is now hard-coded in a bunch of places in thi
justincohen 2013/05/06 14:17:36 Done.
+ },
+ }],
+ ['_toolset=="target"', {
+ 'xcode_settings': {
+ 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)',
+ },
+ }],
['_type=="executable"', {
'configurations': {
'Release_Base': {
@@ -4426,7 +4437,6 @@
'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)',
# Just build armv7, until armv7s is correctly tested.
'VALID_ARCHS': 'armv7 i386',
- 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)',
# Target both iPhone and iPad.
'TARGETED_DEVICE_FAMILY': '1,2',
}],

Powered by Google App Engine
This is Rietveld 408576698