diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 19:21:53 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 19:21:53 +0000 |
| commit | 524f1cfdea8f21922f116fbe96dcd0f71663f4dc (patch) | |
| tree | 0a02ed7462dcaadbee26f1c2df8044b8b591cf02 | |
| parent | e23dbaa81c408c1f7df623b95236f564dc275f3c (diff) | |
| download | chromium_src-524f1cfdea8f21922f116fbe96dcd0f71663f4dc.zip chromium_src-524f1cfdea8f21922f116fbe96dcd0f71663f4dc.tar.gz chromium_src-524f1cfdea8f21922f116fbe96dcd0f71663f4dc.tar.bz2 | |
Add '-ldl' to Linux targets that use dynamic loader functions.
This fixes compilation errors on Karmic, where dlopen() and friends were undefined:
http://chrome-buildbot.corp.google.com:8016/builders/Chromium%20Linux%20Builder%20(dbg-shlib)/builds/7777/steps/compile/logs/stdio
The missing '-ldl' is papered over on Hardy because pretty much everything
depends on gtk, which brings that in through pkg-config, but pkg-config gtk
no longer includes '-ldl' on Karmic.
Review URL: http://codereview.chromium.org/656014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39754 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/base.gypi | 2 | ||||
| -rwxr-xr-x | chrome/chrome_browser.gypi | 6 | ||||
| -rw-r--r-- | gpu/gpu.gyp | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/base/base.gypi b/base/base.gypi index dd03ad3..aee1361 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -381,6 +381,8 @@ 'libraries': [ # We need rt for clock_gettime(). '-lrt', + # For 'native_library_linux.cc' + '-ldl', ], }, }], diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 53eb819..2a19c89 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2207,6 +2207,12 @@ '../build/linux/system.gyp:nss', '../base/base.gyp:linux_versioninfo', ], + 'link_settings': { + 'libraries': [ + # For dlsym() in 'browser/zygote_main_linux.cc' + '-ldl', + ], + }, 'sources!': [ # Exclude extension shelf for toolstrips. 'browser/views/extensions/extension_shelf.cc', diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index c5ace2a..678fc96 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -62,6 +62,8 @@ ], 'libraries': [ '-lX11', + # For dlsym() in '../third_party/glew/src/glew.c' + '-ldl', ], }, }, |