Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

build: i18n: fix issue with icu toolset dependencies #8681

Closed
wants to merge 1 commit into from
Closed

build: i18n: fix issue with icu toolset dependencies #8681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 30 additions & 32 deletions tools/icu/icu-generic.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
{
'target_name': 'icui18n',
'type': '<(library)',
'toolsets': [ 'host', 'target' ],
'toolsets': [ 'target' ],
'sources': [
'<@(icu_src_i18n)'
],
Expand All @@ -108,28 +108,6 @@
},
'export_dependent_settings': [ 'icuucx' ],
},
# this library is only built for derb..
{
'target_name': 'icuio',
'type': '<(library)',
'toolsets': [ 'host' ],
'sources': [
'<@(icu_src_io)'
],
'include_dirs': [
'../../deps/icu/source/io',
],
'defines': [
'U_IO_IMPLEMENTATION=1',
],
'dependencies': [ 'icuucx', 'icui18n', 'icu_implementation', 'icu_uconfig' ],
'direct_dependent_settings': {
'include_dirs': [
'../../deps/icu/source/io',
],
},
'export_dependent_settings': [ 'icuucx', 'icui18n' ],
},
# This exports actual ICU data
{
'target_name': 'icudata',
Expand Down Expand Up @@ -288,7 +266,7 @@
{
'target_name': 'icustubdata',
'type': '<(library)',
'toolsets': [ 'host', 'target' ],
'toolsets': [ 'target' ],
'dependencies': [ 'icu_implementation' ],
'sources': [
'<@(icu_src_stubdata)'
Expand All @@ -313,7 +291,7 @@
'target_name': 'icuucx',
'type': '<(library)',
'dependencies': [ 'icu_implementation', 'icu_uconfig' ],
'toolsets': [ 'host', 'target' ],
'toolsets': [ 'target' ],
'sources': [
'<@(icu_src_common)'
],
Expand Down Expand Up @@ -342,31 +320,51 @@
'target_name': 'icutools',
'type': '<(library)',
'toolsets': [ 'host' ],
'dependencies': [ 'icuucx', 'icui18n', 'icustubdata' ],
'dependencies': [ 'icu_implementation', 'icu_uconfig' ],
'sources': [
'<@(icu_src_tools)'
'<@(icu_src_tools)',
'<@(icu_src_common)',
'<@(icu_src_i18n)',
'<@(icu_src_io)',
'<@(icu_src_stubdata)',
],
'include_dirs': [
'../../deps/icu/source/common',
'../../deps/icu/source/i18n',
'../../deps/icu/source/io',
'../../deps/icu/source/tools/toolutil',
],
'defines': [
'U_COMMON_IMPLEMENTATION=1',
'U_I18N_IMPLEMENTATION=1',
'U_IO_IMPLEMENTATION=1',
'U_TOOLUTIL_IMPLEMENTATION=1',
#'DEBUG=0', # http://bugs.icu-project.org/trac/ticket/10977
],
'direct_dependent_settings': {
'include_dirs': [
'../../deps/icu/source/common',
'../../deps/icu/source/i18n',
'../../deps/icu/source/io',
'../../deps/icu/source/tools/toolutil',
],
'conditions': [
[ 'OS=="win"', {
'link_settings': {
'libraries': [ '-lAdvAPI32.Lib', '-lUser32.lib' ],
},
}],
],
},
'export_dependent_settings': [ 'icuucx', 'icui18n', 'icustubdata' ],
'export_dependent_settings': [ 'icu_implementation', 'icu_uconfig' ],
},
# This tool is needed to rebuild .res files from .txt,
# or to build index (res_index.txt) files for small-icu
{
'target_name': 'genrb',
'type': 'executable',
'toolsets': [ 'host' ],
'dependencies': [ 'icutools', 'icuucx', 'icui18n' ],
'dependencies': [ 'icutools' ],
'sources': [
'<@(icu_src_genrb)'
],
Expand All @@ -382,7 +380,7 @@
'target_name': 'iculslocs',
'toolsets': [ 'host' ],
'type': 'executable',
'dependencies': [ 'icutools', 'icuucx', 'icui18n', 'icuio' ],
'dependencies': [ 'icutools' ],
'sources': [
'iculslocs.cc',
'no-op.cc',
Expand All @@ -394,7 +392,7 @@
'target_name': 'icupkg',
'toolsets': [ 'host' ],
'type': 'executable',
'dependencies': [ 'icutools', 'icuucx', 'icui18n' ],
'dependencies': [ 'icutools' ],
'sources': [
'<@(icu_src_icupkg)',
'no-op.cc',
Expand All @@ -405,7 +403,7 @@
'target_name': 'genccode',
'toolsets': [ 'host' ],
'type': 'executable',
'dependencies': [ 'icutools', 'icuucx', 'icui18n' ],
'dependencies': [ 'icutools' ],
'sources': [
'<@(icu_src_genccode)',
'no-op.cc',
Expand Down