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.gypi | |
| 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.gypi')
| -rw-r--r-- | node.gypi | 34 |
1 files changed, 17 insertions, 17 deletions
@@ -70,7 +70,7 @@ }], [ 'node_use_bundled_v8=="true"', { 'dependencies': [ - 'tools/v8_gypfiles/v8.gyp:v8', + 'tools/v8_gypfiles/v8.gyp:v8_snapshot', 'tools/v8_gypfiles/v8.gyp:v8_libplatform', ], }], @@ -116,21 +116,13 @@ [ 'node_no_browser_globals=="true"', { 'defines': [ 'NODE_NO_BROWSER_GLOBALS' ], } ], - [ 'node_use_bundled_v8=="true" and v8_postmortem_support==1 and force_load=="true"', { - 'xcode_settings': { - 'OTHER_LDFLAGS': [ - '-Wl,-force_load,<(v8_base)', - ], - }, - }], [ 'node_shared_zlib=="false"', { 'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ], 'conditions': [ [ 'force_load=="true"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ - '-Wl,-force_load,<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)' - 'zlib<(STATIC_LIB_SUFFIX)', + '-Wl,-force_load,<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)zlib<(STATIC_LIB_SUFFIX)', ], }, 'msvs_settings': { @@ -143,7 +135,7 @@ 'conditions': [ ['OS!="aix" and node_shared=="false"', { 'ldflags': [ - '-Wl,--whole-archive,' + '-Wl,--whole-archive', '<(obj_dir)/deps/zlib/<(STATIC_LIB_PREFIX)zlib<(STATIC_LIB_SUFFIX)', '-Wl,--no-whole-archive', ], @@ -170,8 +162,7 @@ [ 'force_load=="true"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ - '-Wl,-force_load,<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)' - 'uv<(STATIC_LIB_SUFFIX)', + '-Wl,-force_load,<(PRODUCT_DIR)/libuv<(STATIC_LIB_SUFFIX)', ], }, 'msvs_settings': { @@ -184,7 +175,7 @@ 'conditions': [ ['OS!="aix" and node_shared=="false"', { 'ldflags': [ - '-Wl,--whole-archive,' + '-Wl,--whole-archive', '<(obj_dir)/deps/uv/<(STATIC_LIB_PREFIX)uv<(STATIC_LIB_SUFFIX)', '-Wl,--no-whole-archive', ], @@ -269,9 +260,18 @@ }], [ '(OS=="freebsd" or OS=="linux") and node_shared=="false"' ' and force_load=="true"', { - 'ldflags': [ '-Wl,-z,noexecstack', - '-Wl,--whole-archive <(v8_base)', - '-Wl,--no-whole-archive' ] + 'ldflags': [ + '-Wl,-z,noexecstack', + '-Wl,--whole-archive <(v8_base)', + '-Wl,--no-whole-archive', + ] + }], + [ 'node_use_bundled_v8=="true" and v8_postmortem_support==1 and force_load=="true"', { + 'xcode_settings': { + 'OTHER_LDFLAGS': [ + '-Wl,-force_load,<(v8_base)', + ], + }, }], [ 'coverage=="true" and node_shared=="false" and OS in "mac freebsd linux"', { 'cflags!': [ '-O3' ], |