Skip to content

Commit d4d6986

Browse files
refackitaloacasas
authored andcommitted
build: fix path voodoo in icu-generic.gyp
Intention was to get to `PRODUCT_DIR` so no need to do path voodoo Also added `'msvs_quote_cmd': 0` and more precise quoting PR-URL: #11217 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Fedor Indutny <[email protected]> Reviewed-By: Steven R Loomis <[email protected]>
1 parent a735c16 commit d4d6986

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

tools/icu/icu-generic.gyp

+5-2
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@
228228
'actions': [
229229
{
230230
'action_name': 'icudata',
231+
'msvs_quote_cmd': 0,
231232
'inputs': [ '<(icu_data_in)' ],
232233
'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)<(icu_endianness)_dat.obj' ],
233234
'action': [ '<(PRODUCT_DIR)/genccode',
@@ -247,11 +248,12 @@
247248
{
248249
# trim down ICU
249250
'action_name': 'icutrim',
251+
'msvs_quote_cmd': 0,
250252
'inputs': [ '<(icu_data_in)', 'icu_small.json' ],
251253
'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ],
252254
'action': [ 'python',
253255
'icutrim.py',
254-
'-P', '../../<(CONFIGURATION_NAME)',
256+
'-P', '<(PRODUCT_DIR)/.', # '.' suffix is a workaround against GYP assumptions :(
255257
'-D', '<(icu_data_in)',
256258
'--delete-tmp',
257259
'-T', '<(SHARED_INTERMEDIATE_DIR)/icutmp',
@@ -263,9 +265,10 @@
263265
{
264266
# build final .dat -> .obj
265267
'action_name': 'genccode',
268+
'msvs_quote_cmd': 0,
266269
'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ],
267270
'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)<(icu_endianness)_dat.obj' ],
268-
'action': [ '../../<(CONFIGURATION_NAME)/genccode',
271+
'action': [ '<(PRODUCT_DIR)/genccode',
269272
'-o',
270273
'-d', '<(SHARED_INTERMEDIATE_DIR)/',
271274
'-n', 'icudata',

0 commit comments

Comments
 (0)