summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-23 01:31:49 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-23 01:31:49 +0000
commitee2db900781d37f213ece240c0b8d8e827c1194a (patch)
tree41cebded8f17d86c4d5136f7471fa56ded214858 /build
parentf6314009810a5ee6c606328c41c8ff4e1dacd05e (diff)
downloadchromium_src-ee2db900781d37f213ece240c0b8d8e827c1194a.zip
chromium_src-ee2db900781d37f213ece240c0b8d8e827c1194a.tar.gz
chromium_src-ee2db900781d37f213ece240c0b8d8e827c1194a.tar.bz2
Linux: add -lX11 as a library to WebKit.
r14206 added X code to our WebKit port. However, on some (but not all) machines it seems that they are missing the library when linking test_shell. http://codereview.chromium.org/92056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/linux/system.gyp17
1 files changed, 17 insertions, 0 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index df40c92..8800cb6 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -123,5 +123,22 @@
],
},
},
+ {
+ 'target_name': 'x11',
+ 'type': 'settings',
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(python pkg_config_wrapper.py --cflags x11)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other x11)',
+ ],
+ 'libraries': [
+ '<!@(python pkg_config_wrapper.py --libs-only-l x11)',
+ ],
+ },
+ },
],
}