Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 95ce2db74bd0ea0fbc3abcf524fa3221fbd50879..d481a37e1d4722f947aba497010c27d7688202f5 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -4034,17 +4034,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. |
| @@ -4056,6 +4049,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': [ |
| + ['"<(GENERATOR)"=="ninja" and target_arch=="armv7"', { |
| + 'xcode_settings': { |
| + 'OTHER_LDFLAGS': [ |
| + '-force_load', |
| + '<(arc_toolchain_path)/libarclite_iphoneos.a', |
| + ], |
| + }, |
| + }, { |
| + 'xcode_settings': { |
| + 'OTHER_LDFLAGS': [ |
|
stuartmorgan
2013/05/22 14:02:20
Couldn't you do OTHER_LDFLAGS[arch=armv7] and [arc
|
| + '-force_load', |
| + '<(arc_toolchain_path)/libarclite_iphonesimulator.a', |
| + ], |
| + }, |
| + }], |
| + ], |
| + }], |
| + ], |
| + }], |
| ], |
| }], |
| ], # target_conditions |