Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 73923adccef60582f63d06ec8fb71e1132c48715..078a0dbf57622e8217b55b0d5527398681e7759c 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -4037,17 +4037,10 @@ |
}, |
}, |
}, |
- 'xcode_settings': { |
- # It is necessary to link with the -fobjc-arc flag to use |
- # subscripting on iOS < 6. |
- 'OTHER_LDFLAGS': [ |
- '-fobjc-arc', |
- ], |
- }, |
'conditions': [ |
- # TODO(justincohen): ninja builds don't support signing yet. |
- ['"<(GENERATOR)"!="ninja"', { |
+ ['"<(GENERATOR)"=="xcode"', { |
'xcode_settings': { |
+ # TODO(justincohen): ninja builds don't support signing yet. |
'conditions': [ |
['chromium_ios_signing', { |
# iOS SDK wants everything for device signed. |
@@ -4059,6 +4052,45 @@ |
], |
}, |
}], |
+ ['"<(GENERATOR)"=="xcode" and clang!=1', { |
+ 'xcode_settings': { |
+ # It is necessary to link with the -fobjc-arc flag to use |
+ # subscripting on iOS < 6. |
+ 'OTHER_LDFLAGS': [ |
+ '-fobjc-arc', |
+ ], |
+ }, |
+ }], |
+ ['clang==1', { |
+ 'target_conditions': [ |
+ ['_toolset=="target"', { |
+ 'variables': { |
+ 'developer_dir': '<!(xcode-select -print-path)', |
+ 'arc_toolchain_path': '<(developer_dir)/Toolchains/XcodeDefault.xctoolchain/usr/lib/arc', |
+ }, |
+ # It is necessary to force load libarclite from Xcode for |
+ # third_party/llvm-build because libarclite_* is only |
+ # distributed by Xcode. |
+ 'conditions': [ |
+ ['target_arch=="armv7"', { |
stuartmorgan
2013/05/22 09:06:13
This section doesn't make sense for Xcode (target_
justincohen
2013/05/22 13:50:52
Done.
|
+ 'xcode_settings': { |
+ 'OTHER_LDFLAGS': [ |
+ '-force_load', |
+ '<(arc_toolchain_path)/libarclite_iphoneos.a', |
+ ], |
+ }, |
+ }, { |
+ 'xcode_settings': { |
+ 'OTHER_LDFLAGS': [ |
+ '-force_load', |
+ '<(arc_toolchain_path)/libarclite_iphonesimulator.a', |
+ ], |
+ }, |
+ }], |
+ ], |
+ }], |
+ ], |
+ }], |
], |
}], |
], # target_conditions |