diff options
| author | Refael Ackermann <refack@gmail.com> | 2019-04-07 15:02:04 -0400 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2019-04-16 18:25:04 -0400 |
| commit | 14df42fd008ef8e95d60d0d70084943d180bab91 (patch) | |
| tree | b536d1a90d19190599970fd2659345248885d35f /node.gypi | |
| parent | 5ac0308af90c2ab9842682d06a720cfab11eb661 (diff) | |
| download | android-node-v8-14df42fd008ef8e95d60d0d70084943d180bab91.tar.gz android-node-v8-14df42fd008ef8e95d60d0d70084943d180bab91.tar.bz2 android-node-v8-14df42fd008ef8e95d60d0d70084943d180bab91.zip | |
build: run `mkcodecache` as an action
* fix test-code-cache (for the common cases)
* deprecate `configure --code-cache-path`
PR-URL: https://github.com/nodejs/node/pull/27161
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Diffstat (limited to 'node.gypi')
| -rw-r--r-- | node.gypi | 26 |
1 files changed, 16 insertions, 10 deletions
@@ -143,8 +143,8 @@ 'conditions': [ ['OS!="aix" and node_shared=="false"', { 'ldflags': [ - '-Wl,--whole-archive,<(obj_dir)/deps/zlib/<(STATIC_LIB_PREFIX)' - 'zlib<(STATIC_LIB_SUFFIX)', + '-Wl,--whole-archive,' + '<(obj_dir)/deps/zlib/<(STATIC_LIB_PREFIX)zlib<(STATIC_LIB_SUFFIX)', '-Wl,--no-whole-archive', ], }], @@ -184,8 +184,8 @@ 'conditions': [ ['OS!="aix" and node_shared=="false"', { 'ldflags': [ - '-Wl,--whole-archive,<(obj_dir)/deps/uv/<(STATIC_LIB_PREFIX)' - 'uv<(STATIC_LIB_SUFFIX)', + '-Wl,--whole-archive,' + '<(obj_dir)/deps/uv/<(STATIC_LIB_PREFIX)uv<(STATIC_LIB_SUFFIX)', '-Wl,--no-whole-archive', ], }], @@ -223,27 +223,33 @@ [ 'OS=="aix"', { 'defines': [ '_LINUX_SOURCE_COMPAT', - '__STDC_FORMAT_MACROS' + '__STDC_FORMAT_MACROS', ], 'conditions': [ [ 'force_load=="true"', { - + 'variables': { + 'exp_filename': '<(PRODUCT_DIR)/<(_target_name).exp', + }, 'actions': [ { 'action_name': 'expfile', 'inputs': [ - '<(obj_dir)' + '<(obj_dir)', ], 'outputs': [ - '<(PRODUCT_DIR)/node.exp' + '<(exp_filename)', ], 'action': [ 'sh', 'tools/create_expfile.sh', - '<@(_inputs)', '<@(_outputs)' + '<@(_inputs)', + '<@(_outputs)', ], } ], - 'ldflags': ['-Wl,-bE:<(PRODUCT_DIR)/node.exp', '-Wl,-brtl'], + 'ldflags': [ + '-Wl,-bE:<(exp_filename)', + '-Wl,-brtl', + ], }], ], }], |