summaryrefslogtreecommitdiffstats
path: root/build/linux
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-15 20:55:41 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-15 20:55:41 +0000
commit1a0233feda52a2c6f761e10fee6ea6bef5382f89 (patch)
tree980293cf671f3338b12e2c79e7c41e788e6777fd /build/linux
parent8d8f11d7abee837d6fd15ba9c7d87efdca5d4707 (diff)
downloadchromium_src-1a0233feda52a2c6f761e10fee6ea6bef5382f89.zip
chromium_src-1a0233feda52a2c6f761e10fee6ea6bef5382f89.tar.gz
chromium_src-1a0233feda52a2c6f761e10fee6ea6bef5382f89.tar.bz2
unit_tests: Fix link error (missing libXi) on Linux
unit_tests fails to link due to requirement on libXi. This is implicitly provided by 'gdk', but unit_tests does not depend on this target. We add a 'xi' dependency for any target depending on 'x11'. BUG=63209 TEST=None (Landing patch for jknotten@chromium.org.) Review URL: http://codereview.chromium.org/5016001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
-rw-r--r--build/linux/system.gyp8
1 files changed, 8 insertions, 0 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 7193c67..59cf486 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -234,6 +234,14 @@
'HAVE_XINPUT2',
],
},
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xi)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l xi)',
+ ],
+ }
}],
],
},