Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2707)

Unified Diff: icu.gyp

Issue 195973005: Add support for QNX Neutrino. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/icu46/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: icu.gyp
===================================================================
--- icu.gyp (revision 249466)
+++ icu.gyp (working copy)
@@ -29,7 +29,7 @@
],
}],
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
- or OS=="netbsd" or OS=="mac" or OS=="android") and \
+ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
(target_arch=="arm" or target_arch=="ia32" or \
target_arch=="mipsel")', {
'target_conditions': [
@@ -124,14 +124,16 @@
], # conditions
'target_conditions': [
[ 'OS == "win" or OS == "mac" or OS == "ios" or '
- '(OS == "android" and (_toolset == "target" or host_os != "linux"))', {
+ '(OS == "android" and (_toolset != "host" or host_os != "linux")) or '
+ '(OS == "qnx" and (_toolset == "host" and host_os != "linux"))', {
'sources!': ['linux/icudt46l_dat.S'],
}],
[ 'OS != "android" or _toolset == "host"', {
'sources!': ['android/icudt46l_dat.S'],
}],
[ 'OS != "mac" and OS != "ios" and '
- '(OS != "android" or _toolset != "host" or host_os != "mac")', {
+ '((OS != "android" and OS != "qnx") or '
+ '_toolset != "host" or host_os != "mac")', {
Mark Mentovai 2014/03/18 15:37:17 No tabs.
'sources!': ['mac/icudt46l_dat.S'],
}],
], # target_conditions
@@ -361,8 +363,17 @@
'-licuuc',
],
},
- },{ # OS!="android"
+ }],
+ ['OS=="qnx"', {
'link_settings': {
+ 'libraries': [
+ '-licui18n',
+ '-licuuc',
+ ],
+ },
+ }],
+ ['OS!="android" and OS!="qnx"', {
+ 'link_settings': {
'ldflags': [
'<!@(icu-config --ldflags)',
],
« no previous file with comments | « README.chromium ('k') | patches/platform.qnx.patch » ('j') | source/common/unicode/ptypes.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698