Skip to content

Commit be32bec

Browse files
committed
build: fix building with d8
PR-URL: #28733 Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent b8079f5 commit be32bec

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

node.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
'defines': [ '__POSIX__' ],
6767
}],
6868
[ 'node_enable_d8=="true"', {
69-
'dependencies': [ 'deps/v8/gypfiles/d8.gyp:d8' ],
69+
'dependencies': [ 'tools/v8_gypfiles/d8.gyp:d8' ],
7070
}],
7171
[ 'node_use_bundled_v8=="true"', {
7272
'dependencies': [

tools/v8_gypfiles/d8.gyp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
{
66
'variables': {
7+
'V8_ROOT': '../../deps/v8',
78
'v8_code': 1,
89
'v8_enable_i18n_support%': 1,
910
},
@@ -16,23 +17,24 @@
1617
'v8.gyp:v8',
1718
'v8.gyp:v8_libbase',
1819
'v8.gyp:v8_libplatform',
20+
'v8.gyp:generate_bytecode_builtins_list',
1921
],
2022
# Generated source files need this explicitly:
2123
'include_dirs+': [
22-
'..',
24+
'<(V8_ROOT)',
2325
'<(DEPTH)',
2426
'<(SHARED_INTERMEDIATE_DIR)',
2527
],
2628
'sources': [
27-
'../src/async-hooks-wrapper.cc',
28-
'../src/async-hooks-wrapper.h',
29-
'../src/d8-console.cc',
30-
'../src/d8-console.h',
31-
'../src/d8-js.cc',
32-
'../src/d8-platforms.cc',
33-
'../src/d8-platforms.h',
34-
'../src/d8.cc',
35-
'../src/d8.h',
29+
'<(V8_ROOT)/src/async-hooks-wrapper.cc',
30+
'<(V8_ROOT)/src/async-hooks-wrapper.h',
31+
'<(V8_ROOT)/src/d8-console.cc',
32+
'<(V8_ROOT)/src/d8-console.h',
33+
'<(V8_ROOT)/src/d8-js.cc',
34+
'<(V8_ROOT)/src/d8-platforms.cc',
35+
'<(V8_ROOT)/src/d8-platforms.h',
36+
'<(V8_ROOT)/src/d8.cc',
37+
'<(V8_ROOT)/src/d8.h',
3638
],
3739
'conditions': [
3840
[ 'want_separate_host_toolset==1', {
@@ -44,10 +46,10 @@
4446
['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
4547
or OS=="openbsd" or OS=="solaris" or OS=="android" \
4648
or OS=="qnx" or OS=="aix")', {
47-
'sources': [ '../src/d8-posix.cc', ]
49+
'sources': [ '<(V8_ROOT)/src/d8-posix.cc', ]
4850
}],
4951
[ 'OS=="win"', {
50-
'sources': [ '../src/d8-windows.cc', ]
52+
'sources': [ '<(V8_ROOT)/src/d8-windows.cc', ]
5153
}],
5254
[ 'component!="shared_library"', {
5355
'conditions': [

0 commit comments

Comments
 (0)