diff options
| author | Refael Ackermann <refack@gmail.com> | 2017-03-30 00:01:11 -0400 |
|---|---|---|
| committer | Gibson Fahnestock <gibfahn@gmail.com> | 2017-04-06 08:21:46 +0100 |
| commit | e139dae157cca968e89de51ad435ded23f2b8be1 (patch) | |
| tree | 789d5a1b58bebfe3c361a580769b1de67d252ed2 /tools/icu/icu-generic.gyp | |
| parent | 23498f259db2d26c30969c0f66a380adf8725cd9 (diff) | |
| download | android-node-v8-e139dae157cca968e89de51ad435ded23f2b8be1.tar.gz android-node-v8-e139dae157cca968e89de51ad435ded23f2b8be1.tar.bz2 android-node-v8-e139dae157cca968e89de51ad435ded23f2b8be1.zip | |
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: https://github.com/nodejs/node/pull/11217
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
Diffstat (limited to 'tools/icu/icu-generic.gyp')
| -rw-r--r-- | tools/icu/icu-generic.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/icu/icu-generic.gyp b/tools/icu/icu-generic.gyp index cf615717e8..b3231acd4a 100644 --- a/tools/icu/icu-generic.gyp +++ b/tools/icu/icu-generic.gyp @@ -228,6 +228,7 @@ 'actions': [ { 'action_name': 'icudata', + 'msvs_quote_cmd': 0, 'inputs': [ '<(icu_data_in)' ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)<(icu_endianness)_dat.obj' ], 'action': [ '<(PRODUCT_DIR)/genccode', @@ -247,11 +248,12 @@ { # trim down ICU 'action_name': 'icutrim', + 'msvs_quote_cmd': 0, 'inputs': [ '<(icu_data_in)', 'icu_small.json' ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ], 'action': [ 'python', 'icutrim.py', - '-P', '../../<(CONFIGURATION_NAME)', + '-P', '<(PRODUCT_DIR)/.', # '.' suffix is a workaround against GYP assumptions :( '-D', '<(icu_data_in)', '--delete-tmp', '-T', '<(SHARED_INTERMEDIATE_DIR)/icutmp', @@ -263,9 +265,10 @@ { # build final .dat -> .obj 'action_name': 'genccode', + 'msvs_quote_cmd': 0, 'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)<(icu_endianness)_dat.obj' ], - 'action': [ '../../<(CONFIGURATION_NAME)/genccode', + 'action': [ '<(PRODUCT_DIR)/genccode', '-o', '-d', '<(SHARED_INTERMEDIATE_DIR)/', '-n', 'icudata', |