diff options
| author | Refael Ackermann <refack@gmail.com> | 2019-03-29 03:38:12 -0400 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2019-06-01 09:55:36 -0400 |
| commit | 417c18e83472373ea1829f451b0bc87b17565d14 (patch) | |
| tree | 3cb1c3812d0a8d25043a3e36832b15ff230dd42b /node.gyp | |
| parent | e3cd79ef8edfd60abbf1c88e050a0a215d3672e8 (diff) | |
| download | android-node-v8-417c18e83472373ea1829f451b0bc87b17565d14.tar.gz android-node-v8-417c18e83472373ea1829f451b0bc87b17565d14.tar.bz2 android-node-v8-417c18e83472373ea1829f451b0bc87b17565d14.zip | |
build,v8: sync V8 gypfiles with 7.5
Co-authored-by: Ujjwal Sharma <usharma1998@gmail.com>
Co-authored-by: Michaël Zasso <targos@protonmail.com>
PR-URL: https://github.com/nodejs/node/pull/27375
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'node.gyp')
| -rw-r--r-- | node.gyp | 62 |
1 files changed, 33 insertions, 29 deletions
@@ -344,22 +344,24 @@ [ 'node_intermediate_lib_type=="static_library" and node_shared=="false"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ - '-Wl,-force_load,<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)' - '<(node_core_target_name)<(STATIC_LIB_SUFFIX)', + '-Wl,-force_load,<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)<(node_core_target_name)<(STATIC_LIB_SUFFIX)', + '-Wl,-force_load,<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)v8_base_without_compiler<(STATIC_LIB_SUFFIX)', ], }, 'msvs_settings': { 'VCLinkerTool': { 'AdditionalOptions': [ '/WHOLEARCHIVE:<(node_lib_target_name)<(STATIC_LIB_SUFFIX)', + '/WHOLEARCHIVE:<(STATIC_LIB_PREFIX)v8_base_without_compiler<(STATIC_LIB_SUFFIX)', ], }, }, 'conditions': [ - ['OS!="aix"', { + ['OS != "aix" and OS != "mac"', { 'ldflags': [ - '-Wl,--whole-archive,<(obj_dir)/<(STATIC_LIB_PREFIX)' - '<(node_core_target_name)<(STATIC_LIB_SUFFIX)', + '-Wl,--whole-archive', + '<(obj_dir)/<(STATIC_LIB_PREFIX)<(node_core_target_name)<(STATIC_LIB_SUFFIX)', + '<(obj_dir)/tools/v8_gypfiles/<(STATIC_LIB_PREFIX)v8_base_without_compiler<(STATIC_LIB_SUFFIX)', '-Wl,--no-whole-archive', ], }], @@ -386,10 +388,12 @@ 'NODE_ARCH="<(target_arch)"', 'NODE_PLATFORM="<(OS)"', ], - 'conditions': [ - ['OS=="win"', { - 'libraries': [ 'Ws2_32' ], - }], + }], + ['OS=="win"', { + 'libraries': [ + 'Dbghelp.lib', + 'winmm.lib', + 'Ws2_32.lib', ], }], ['node_with_ltcg=="true"', { @@ -986,7 +990,7 @@ { 'action_name': 'node_dtrace_ustack_constants', 'inputs': [ - '<(v8_base)' + '<(obj_dir)/tools/v8_gypfiles/<(STATIC_LIB_PREFIX)v8_base_without_compiler<(STATIC_LIB_SUFFIX)' ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/v8constants.h' @@ -1140,8 +1144,16 @@ }], ], }], + ['OS=="win"', { + 'libraries': [ + 'Dbghelp.lib', + 'winmm.lib', + 'Ws2_32.lib', + ], + }], ], }, # cctest + # TODO(joyeecheung): do not depend on node_lib, # instead create a smaller static library node_lib_base that does # just enough for node_native_module.cc and the cache builder to @@ -1181,20 +1193,12 @@ ], 'conditions': [ - [ 'node_report=="true"', { - 'conditions': [ - ['OS=="win"', { - 'libraries': [ - 'dbghelp.lib', - 'PsApi.lib', - 'Ws2_32.lib', - ], - 'dll_files': [ - 'dbghelp.dll', - 'PsApi.dll', - 'Ws2_32.dll', - ], - }], + ['OS=="win"', { + 'libraries': [ + 'dbghelp.lib', + 'PsApi.lib', + 'winmm.lib', + 'Ws2_32.lib', ], }], ], @@ -1231,11 +1235,11 @@ ], 'conditions': [ - [ 'node_report=="true"', { - 'conditions': [ - ['OS=="win"', { - 'libraries': [ 'Ws2_32' ], - }], + ['OS=="win"', { + 'libraries': [ + 'Dbghelp.lib', + 'winmm.lib', + 'Ws2_32.lib', ], }], ], |