diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 22:51:32 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 22:51:32 +0000 |
| commit | f81380b51ef02003bc45374a8fc3cb8b70b5a3cd (patch) | |
| tree | 7c58e303b96f55e5966f4b23a24acd5330ba6000 /third_party | |
| parent | 413df1b5ebacf0f3bc2ad03020e9f93b92717803 (diff) | |
| download | chromium_src-f81380b51ef02003bc45374a8fc3cb8b70b5a3cd.zip chromium_src-f81380b51ef02003bc45374a8fc3cb8b70b5a3cd.tar.gz chromium_src-f81380b51ef02003bc45374a8fc3cb8b70b5a3cd.tar.bz2 | |
Fix the Linux shared build.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/203076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 6 | ||||
| -rw-r--r-- | third_party/libevent/libevent.gyp | 14 | ||||
| -rw-r--r-- | third_party/libxml/libxml.gyp | 8 | ||||
| -rw-r--r-- | third_party/sqlite/sqlite.gyp | 10 |
4 files changed, 33 insertions, 5 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 623aa06..f118075 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -148,6 +148,12 @@ '../..', # The chromium 'src' directory. ], }, + 'link_settings': { + 'libraries': [ + # We need dl for dlopen() and friends. + '-ldl', + ], + }, 'actions': [ { 'action_name': 'generate_stubs', diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp index fc95efb..352fb32 100644 --- a/third_party/libevent/libevent.gyp +++ b/third_party/libevent/libevent.gyp @@ -37,8 +37,18 @@ # libevent has platform-specific implementation files. Since its # native build uses autoconf, platform-specific config.h files are # provided and live in platform-specific directories. - [ 'OS == "linux"', { 'sources': [ 'epoll.c', 'epoll_sub.c' ], - 'include_dirs': [ 'linux' ] } ], + [ 'OS == "linux"', { + 'sources': [ 'epoll.c', 'epoll_sub.c' ], + 'include_dirs': [ 'linux' ], + 'link_settings': + { 'libraries': [ + # We need rt for clock_gettime(). + # TODO(port) Maybe on FreeBSD as well? + '-lrt', + ], + }, + } + ], [ 'OS == "mac" or OS == "freebsd"', { 'sources': [ 'kqueue.c' ], 'include_dirs': [ 'mac' ] } ], ], diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp index f785fd7..ed16e58 100644 --- a/third_party/libxml/libxml.gyp +++ b/third_party/libxml/libxml.gyp @@ -174,6 +174,14 @@ ], }, 'conditions': [ + ['OS=="linux"', { + 'link_settings': { + 'libraries': [ + # We need dl for dlopen() and friends. + '-ldl', + ], + }, + }], ['OS=="mac"', {'defines': ['_REENTRANT']}], ['OS=="win"', { 'product_name': 'libxml2', diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp index 9297345..cd1af20 100644 --- a/third_party/sqlite/sqlite.gyp +++ b/third_party/sqlite/sqlite.gyp @@ -24,6 +24,13 @@ { 'target_name': 'sqlite', 'conditions': [ + ['OS=="linux" and not use_system_sqlite', { + 'link_settings': { + 'libraries': [ + '-ldl', + ], + }, + }], ['OS=="linux" and use_system_sqlite', { 'type': 'settings', 'direct_dependent_settings': { @@ -224,9 +231,6 @@ ], 'link_settings': { 'link_languages': ['c++'], - 'libraries': [ - '-ldl', - ], }, }, ], |