summaryrefslogtreecommitdiff
path: root/chromium/build/linux/system.gyp
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2014-03-22 00:04:29 +0100
committerZeno Albisser <zeno.albisser@digia.com>2014-04-23 14:53:06 +0200
commit0bfb47de4e2ebc8f9ccf915e84aae3e37feeb2af (patch)
tree82e3665c3f3c7efcb1dc8d64ec9d672d369e85d2 /chromium/build/linux/system.gyp
parent851eff42d87e5af425dcd5008c3c53dde119536c (diff)
downloadqtwebengine-chromium-0bfb47de4e2ebc8f9ccf915e84aae3e37feeb2af.tar.gz
Adjust gyp defines for eLinux.
- Add Raspberry PI chipset to list of defined platforms. - Make sure to include sources for xdg support. - Do not use pkg-config-wrapper, as our sysroot pkg-config already returns absolute paths. - Use openssl for eLinux. - Use fontconfig and freetype2 for eLinux. - Use chacha_vec.c to avoid hard/soft float mismatch. Change-Id: I8dd21c480922f32ac7111ea5582d82c249414caa Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'chromium/build/linux/system.gyp')
-rw-r--r--chromium/build/linux/system.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/build/linux/system.gyp b/chromium/build/linux/system.gyp
index 1451afbd214..72af0810380 100644
--- a/chromium/build/linux/system.gyp
+++ b/chromium/build/linux/system.gyp
@@ -5,7 +5,7 @@
{
'variables': {
'conditions': [
- ['sysroot!=""', {
+ ['sysroot!="" and qt_os=="embedded_linux"', {
'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
}, {
'pkg-config': 'pkg-config'