diff options
| author | Michaël Zasso <targos@protonmail.com> | 2019-07-17 17:55:12 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2019-07-20 11:30:00 +0200 |
| commit | be32becb671e1bef51e5d162cbe55293be9748e3 (patch) | |
| tree | 11061b76e12267f6c64c0319431f346c21f33bf9 | |
| parent | b8079f5c23c7550196e1d0797a4294c684c53509 (diff) | |
| download | android-node-v8-be32becb671e1bef51e5d162cbe55293be9748e3.tar.gz android-node-v8-be32becb671e1bef51e5d162cbe55293be9748e3.tar.bz2 android-node-v8-be32becb671e1bef51e5d162cbe55293be9748e3.zip | |
build: fix building with d8
PR-URL: https://github.com/nodejs/node/pull/28733
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
| -rw-r--r-- | node.gypi | 2 | ||||
| -rw-r--r-- | tools/v8_gypfiles/d8.gyp | 26 |
2 files changed, 15 insertions, 13 deletions
@@ -66,7 +66,7 @@ 'defines': [ '__POSIX__' ], }], [ 'node_enable_d8=="true"', { - 'dependencies': [ 'deps/v8/gypfiles/d8.gyp:d8' ], + 'dependencies': [ 'tools/v8_gypfiles/d8.gyp:d8' ], }], [ 'node_use_bundled_v8=="true"', { 'dependencies': [ diff --git a/tools/v8_gypfiles/d8.gyp b/tools/v8_gypfiles/d8.gyp index 240df03380..e995c3cf56 100644 --- a/tools/v8_gypfiles/d8.gyp +++ b/tools/v8_gypfiles/d8.gyp @@ -4,6 +4,7 @@ { 'variables': { + 'V8_ROOT': '../../deps/v8', 'v8_code': 1, 'v8_enable_i18n_support%': 1, }, @@ -16,23 +17,24 @@ 'v8.gyp:v8', 'v8.gyp:v8_libbase', 'v8.gyp:v8_libplatform', + 'v8.gyp:generate_bytecode_builtins_list', ], # Generated source files need this explicitly: 'include_dirs+': [ - '..', + '<(V8_ROOT)', '<(DEPTH)', '<(SHARED_INTERMEDIATE_DIR)', ], 'sources': [ - '../src/async-hooks-wrapper.cc', - '../src/async-hooks-wrapper.h', - '../src/d8-console.cc', - '../src/d8-console.h', - '../src/d8-js.cc', - '../src/d8-platforms.cc', - '../src/d8-platforms.h', - '../src/d8.cc', - '../src/d8.h', + '<(V8_ROOT)/src/async-hooks-wrapper.cc', + '<(V8_ROOT)/src/async-hooks-wrapper.h', + '<(V8_ROOT)/src/d8-console.cc', + '<(V8_ROOT)/src/d8-console.h', + '<(V8_ROOT)/src/d8-js.cc', + '<(V8_ROOT)/src/d8-platforms.cc', + '<(V8_ROOT)/src/d8-platforms.h', + '<(V8_ROOT)/src/d8.cc', + '<(V8_ROOT)/src/d8.h', ], 'conditions': [ [ 'want_separate_host_toolset==1', { @@ -44,10 +46,10 @@ ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \ or OS=="openbsd" or OS=="solaris" or OS=="android" \ or OS=="qnx" or OS=="aix")', { - 'sources': [ '../src/d8-posix.cc', ] + 'sources': [ '<(V8_ROOT)/src/d8-posix.cc', ] }], [ 'OS=="win"', { - 'sources': [ '../src/d8-windows.cc', ] + 'sources': [ '<(V8_ROOT)/src/d8-windows.cc', ] }], [ 'component!="shared_library"', { 'conditions': [ |