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

Unified Diff: icu.gyp

Issue 141063008: Add support for QNX Neutrino. Base URL: https://chromium.googlesource.com/chromium/deps/icu46.git@master
Patch Set: Undo change to _XOPEN_SOURCE_EXTENDED Created 6 years, 10 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
« no previous file with comments | « README.chromium ('k') | patches/platform.qnx.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: icu.gyp
diff --git a/icu.gyp b/icu.gyp
index 883defdfb93bee40957db0e22d2324add1183240..6c0b2a44b5d81049522ffe3543c226b605635ac2 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -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,15 @@
], # 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")', {
'sources!': ['mac/icudt46l_dat.S'],
}],
], # target_conditions
@@ -361,7 +362,16 @@
'-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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698