summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-05-06 17:05:55 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-06-04 18:18:49 +0200
commit3394f35a8ddf19372cd6b2fec6475c9759dadca2 (patch)
tree6a7e3cea9ac2af2f98f9150f2f4694b0eafec742
parent6e52f09bc71d25a6646f454028317fb7b4746a54 (diff)
<third_party/icu> Do not use icu-config on eLinux
We require that the icu libs are in the default library seach path. Change-Id: Ia4981781f4239617831909da1250a61191a8c7dd Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
-rw-r--r--chromium/third_party/icu/icu.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/third_party/icu/icu.gyp b/chromium/third_party/icu/icu.gyp
index 4d8259af005..416050d66d8 100644
--- a/chromium/third_party/icu/icu.gyp
+++ b/chromium/third_party/icu/icu.gyp
@@ -642,6 +642,8 @@
],
},
},{ # OS!="android"
+ 'conditions': [
+ ['qt_os!="embedded_linux"', {
'link_settings': {
'ldflags': [
'<!@(icu-config --ldflags)',
@@ -650,6 +652,8 @@
'<!@(icu-config --ldflags-libsonly)',
],
},
+ }],
+ ],
}],
],
},