summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-16 14:42:13 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-16 14:42:13 +0000
commitb1bf13e8638c4c2505b8169ee56c0552d957ff7b (patch)
treef937b1e5866fbaa20df122b815763c5d26c71f9f /build
parentdf98d99d699935ba059e2cd554559f2a58a9c57d (diff)
downloadchromium_src-b1bf13e8638c4c2505b8169ee56c0552d957ff7b.zip
chromium_src-b1bf13e8638c4c2505b8169ee56c0552d957ff7b.tar.gz
chromium_src-b1bf13e8638c4c2505b8169ee56c0552d957ff7b.tar.bz2
Allow unit_tests (and other non-bundle executables) to rely on objectiveC that's
not directly referenced (such as only in a nib file). Add test for tab controller. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi6
1 files changed, 2 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 6a67a24..087c964 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -293,10 +293,8 @@
},
'target_conditions': [
['_type!="static_library"', {
- 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
- }],
- ['_mac_bundle', {
- 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+ 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first',
+ '-Wl,-ObjC']},
}],
['_type=="executable"', {
'postbuilds': [