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

Commit 6c779b4

Browse files
committed
build: i18n: fix toolset dependencies, see #7719 (comment)
1 parent 05e61cb commit 6c779b4

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

tools/icu/icu-generic.gyp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
{
134134
'target_name': 'icudata',
135135
'type': '<(library)',
136-
'toolsets': [ 'host' ],
136+
'toolsets': [ 'target' ],
137137
'conditions': [
138138
[ 'OS == "win"', {
139139
'conditions': [
@@ -157,7 +157,7 @@
157157
}, { # icu_small == TRUE and OS == win
158158
# link against stub data primarily
159159
# then, use icupkg and genccode to rebuild data
160-
'dependencies': [ 'icustubdata#target', 'genccode#host', 'icupkg#host', 'genrb#host', 'iculslocs#host' ],
160+
'dependencies': [ 'icustubdata', 'genccode#host', 'icupkg#host', 'genrb#host', 'iculslocs#host' ],
161161
'export_dependent_settings': [ 'icustubdata' ],
162162
'actions': [
163163
{
@@ -196,7 +196,7 @@
196196
[ 'icu_small == "false"', {
197197
# full data - just build the full data file, then we are done.
198198
'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)_dat.c' ],
199-
'dependencies': [ 'genccode#host', 'icupkg#host', 'icu_implementation#host', 'icu_uconfig#host' ],
199+
'dependencies': [ 'genccode#host', 'icupkg#host', 'icu_implementation#host', 'icu_uconfig' ],
200200
'include_dirs': [
201201
'../../deps/icu/source/common',
202202
],
@@ -236,8 +236,8 @@
236236
}, { # icu_small == true ( and OS != win )
237237
# link against stub data (as primary data)
238238
# then, use icupkg and genccode to rebuild small data
239-
'dependencies': [ 'icustubdata#target', 'genccode#host', 'icupkg#host', 'genrb#host', 'iculslocs#host',
240-
'icu_implementation#target', 'icu_uconfig#target' ],
239+
'dependencies': [ 'icustubdata', 'genccode#host', 'icupkg#host', 'genrb#host', 'iculslocs#host',
240+
'icu_implementation', 'icu_uconfig' ],
241241
'export_dependent_settings': [ 'icustubdata' ],
242242
'actions': [
243243
{
@@ -298,10 +298,11 @@
298298
},
299299
# this target is for v8 consumption.
300300
# it is icuuc + stubdata
301+
# it is only built for target
301302
{
302303
'target_name': 'icuuc',
303304
'type': 'none',
304-
'toolsets': [ 'host', 'target' ],
305+
'toolsets': [ 'target' ],
305306
'dependencies': [ 'icuucx', 'icudata' ],
306307
'export_dependent_settings': [ 'icuucx', 'icudata' ],
307308
},

0 commit comments

Comments
 (0)