summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-11 01:16:30 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-11 01:16:30 +0000
commit791c0ef295e2904c1ca7db77377fbab876b04c5c (patch)
tree6f3456ce158eae1c41b216c1f998bbc018128ba8 /third_party
parente96b382001770480b12e8f241b33a1084bad5175 (diff)
downloadchromium_src-791c0ef295e2904c1ca7db77377fbab876b04c5c.zip
chromium_src-791c0ef295e2904c1ca7db77377fbab876b04c5c.tar.gz
chromium_src-791c0ef295e2904c1ca7db77377fbab876b04c5c.tar.bz2
Fix some shared_library link_settings propagation issues
Starting at gyp r1717, link_settings no longer propagate outside shared_library targets. These changes are necessary to fix link_settings that were poorly specified in the past because of relying on the GYP bug. Details about the specific changes are documented in: https://codereview.chromium.org/23557010/ BUG= R=agl@chromium.org, mark@chromium.org, shess@chromium.org, thakis@chromium.org Review URL: https://codereview.chromium.org/24078004 Patch from Shezan Baig <sbaig1@bloomberg.net>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/sqlite/sqlite.gyp7
1 files changed, 7 insertions, 0 deletions
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index c45ccd0..885b7f5 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -127,6 +127,13 @@
],
},
}],
+ ['OS == "mac" or OS == "ios"', {
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
+ ],
+ },
+ }],
['OS == "android"', {
'defines': [
'HAVE_USLEEP=1',