summaryrefslogtreecommitdiff
path: root/chromium/build/linux/system.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/build/linux/system.gyp')
-rw-r--r--chromium/build/linux/system.gyp6
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/build/linux/system.gyp b/chromium/build/linux/system.gyp
index 4a7e857efc1..1451afbd214 100644
--- a/chromium/build/linux/system.gyp
+++ b/chromium/build/linux/system.gyp
@@ -29,7 +29,7 @@
'use_system_ssl%': 1,
},
}],
- [ 'chromeos==0', {
+ [ 'chromeos==0 and use_qt==0', {
# Hide GTK and related dependencies for Chrome OS, so they won't get
# added back to Chrome OS. Don't try to use GTK on Chrome OS.
'targets': [
@@ -660,6 +660,8 @@
'type': 'none',
'toolsets': ['host', 'target'],
'conditions': [
+ ['use_pango==1', {
+ 'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
'cflags': [
@@ -690,6 +692,8 @@
},
}],
],
+ }],
+ ],
},
{
'target_name': 'ssl',