Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 122f557fceb8df1e5b0148bee60f17a4ee1ce194..48191dc46ede48e3c5519d30e5f4aebad3f668b4 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -4161,6 +4161,7 @@ |
'xcode_settings': { |
'SDKROOT': 'macosx<(mac_sdk)', # -isysroot |
'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)', |
+ 'ARCHS': ['i386'], |
Nico
2013/07/18 00:29:08
Don't you want to use 64 bit host binaries?
justincohen
2013/07/18 02:04:09
Done.
|
}, |
}], |
['_toolset=="target"', { |
@@ -4170,6 +4171,13 @@ |
# instead set it here for target only. |
'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)', |
}, |
+ 'conditions': [ |
+ ['target_arch=="armv7"', { |
+ 'xcode_settings': { 'ARCHS': [ 'armv7' ]}, |
+ }, { |
+ 'xcode_settings': { 'ARCHS': [ 'i386' ] }, |
Nico
2013/07/18 00:29:08
is this block needed?
justincohen
2013/07/18 02:04:09
Yes, we still need to set the target to i386 for s
|
+ }], |
+ ], |
}], |
['_type=="executable"', { |
'configurations': { |
@@ -4612,10 +4620,10 @@ |
['ios_sdk_path==""', { |
'conditions': [ |
# TODO(justincohen): Ninja only supports simulator for now. |
- ['"<(GENERATOR)"=="ninja"', { |
- 'SDKROOT': 'iphonesimulator<(ios_sdk)', # -isysroot |
- }, { |
+ ['"<(GENERATOR)"=="xcode" or ("<(GENERATOR)"=="ninja" and target_arch=="armv7")', { |
'SDKROOT': 'iphoneos<(ios_sdk)', # -isysroot |
+ }, { |
+ 'SDKROOT': 'iphonesimulator<(ios_sdk)', # -isysroot |
}], |
], |
}, { |
@@ -4629,6 +4637,9 @@ |
# Target both iPhone and iPad. |
'TARGETED_DEVICE_FAMILY': '1,2', |
}], |
+ ['OS=="ios" and "<(GENERATOR)"!="ninja"', { |
+ 'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)', |
+ }], |
['target_arch=="x64"', { |
'ARCHS': [ |
'x86_64' |