diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 09:09:30 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 09:09:30 +0000 |
| commit | 6ee05a5b3e33668d67deb9a000ba5d32b3104c7a (patch) | |
| tree | 0d78e2b5b7840b20c4f03d609e6ea507709ad251 /webkit | |
| parent | a464cc798130d851a1bb61d7b150fe4b9118d94d (diff) | |
| download | chromium_src-6ee05a5b3e33668d67deb9a000ba5d32b3104c7a.zip chromium_src-6ee05a5b3e33668d67deb9a000ba5d32b3104c7a.tar.gz chromium_src-6ee05a5b3e33668d67deb9a000ba5d32b3104c7a.tar.bz2 | |
Use gyp targets to link in X11 libraries instead of setting -lXfoo
This sets up gyp targets for the various X11 libraries we use and uses
pkg-config to determine the correct cflags/ldflags incantations to use to
link against them instead of listing out -lXfoo lines in libraries sections
in gyp targets throughout the tree. This is more likely to generate the right
lines and makes the dependencies a bit more explicit.
BUG=339518
Review URL: https://codereview.chromium.org/153223002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/common/webkit_common.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp index 3de9cff..33eec7c 100644 --- a/webkit/common/webkit_common.gyp +++ b/webkit/common/webkit_common.gyp @@ -75,9 +75,9 @@ ], }], ['use_aura==1 and use_x11==1', { - 'link_settings': { - 'libraries': [ '-lXcursor', ], - }, + 'dependencies': [ + '<(DEPTH)/build/linux/system.gyp:xcursor', + ], }], ['use_ozone==0', { 'sources!': [ |