| Index: icu.gyp
|
| ===================================================================
|
| --- icu.gyp (revision 259309)
|
| +++ icu.gyp (working copy)
|
| @@ -155,6 +155,22 @@
|
| 'source/i18n',
|
| ],
|
| },
|
| + # Since ICU wants to internally use its own deprecated APIs, don't
|
| + # complain about it.
|
| + 'cflags': [
|
| + '-Wno-deprecated-declarations',
|
| + ],
|
| + 'cflags_cc': [
|
| + '-frtti',
|
| + ],
|
| + 'xcode_settings': {
|
| + 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti
|
| + },
|
| + 'msvs_settings': {
|
| + 'VCCLCompilerTool': {
|
| + 'RuntimeTypeInfo': 'true',
|
| + },
|
| + },
|
| 'conditions': [
|
| [ 'use_system_icu==1 and want_separate_host_toolset==1', {
|
| 'toolsets': ['host'],
|
| @@ -165,28 +181,6 @@
|
| [ 'use_system_icu==0 and want_separate_host_toolset==0', {
|
| 'toolsets': ['target'],
|
| }],
|
| - [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
|
| - # Since ICU wants to internally use its own deprecated APIs, don't
|
| - # complain about it.
|
| - 'cflags': [
|
| - '-Wno-deprecated-declarations',
|
| - ],
|
| - 'cflags_cc': [
|
| - '-frtti',
|
| - ],
|
| - }],
|
| - ['OS == "mac" or OS == "ios"', {
|
| - 'xcode_settings': {
|
| - 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti
|
| - },
|
| - }],
|
| - ['OS == "win"', {
|
| - 'msvs_settings': {
|
| - 'VCCLCompilerTool': {
|
| - 'RuntimeTypeInfo': 'true',
|
| - },
|
| - }
|
| - }],
|
| ['clang==1', {
|
| 'xcode_settings': {
|
| 'WARNING_CFLAGS': [
|
| @@ -262,6 +256,23 @@
|
| }],
|
| ],
|
| },
|
| + 'cflags': [
|
| + # Since ICU wants to internally use its own deprecated APIs,
|
| + # don't complain about it.
|
| + '-Wno-deprecated-declarations',
|
| + '-Wno-unused-function',
|
| + ],
|
| + 'cflags_cc': [
|
| + '-frtti',
|
| + ],
|
| + 'xcode_settings': {
|
| + 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti
|
| + },
|
| + 'msvs_settings': {
|
| + 'VCCLCompilerTool': {
|
| + 'RuntimeTypeInfo': 'true',
|
| + },
|
| + },
|
| 'conditions': [
|
| [ 'use_system_icu==1 and want_separate_host_toolset==1', {
|
| 'toolsets': ['host'],
|
| @@ -277,29 +288,6 @@
|
| 'source/stubdata/stubdata.c',
|
| ],
|
| }],
|
| - [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
|
| - 'cflags': [
|
| - # Since ICU wants to internally use its own deprecated APIs,
|
| - # don't complain about it.
|
| - '-Wno-deprecated-declarations',
|
| - '-Wno-unused-function',
|
| - ],
|
| - 'cflags_cc': [
|
| - '-frtti',
|
| - ],
|
| - }],
|
| - ['OS == "mac" or OS == "ios"', {
|
| - 'xcode_settings': {
|
| - 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti
|
| - },
|
| - }],
|
| - ['OS == "win"', {
|
| - 'msvs_settings': {
|
| - 'VCCLCompilerTool': {
|
| - 'RuntimeTypeInfo': 'true',
|
| - },
|
| - },
|
| - }],
|
| ['OS == "android" and use_system_stlport == 1', {
|
| 'target_conditions': [
|
| ['_toolset == "target"', {
|
|
|