Skip to content

Commit

Permalink
build: update V8 gypfile paths
Browse files Browse the repository at this point in the history
The location of various gypfiles has changed in V8 5.2.
  • Loading branch information
targos committed Jul 26, 2016
1 parent 8c13873 commit 2d7abd9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ $(NODE_G_EXE): config.gypi out/Makefile
$(MAKE) -C out BUILDTYPE=Debug V=$(V)
ln -fs out/Debug/$(NODE_EXE) $@

out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi deps/v8/gypfiles/features.gypi deps/v8/src/v8.gyp node.gyp config.gypi
$(PYTHON) tools/gyp_node.py -f make

config.gypi: configure
Expand Down
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
}, {
'OBJ_DIR': '<(PRODUCT_DIR)/obj.target',
'V8_BASE': '<(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.a',
'V8_BASE': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
}],
['openssl_fips != ""', {
'OPENSSL_PRODUCT': 'libcrypto.a',
Expand Down
12 changes: 6 additions & 6 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@
}],
[ 'node_use_bundled_v8=="true"', {
'dependencies': [
'deps/v8/tools/gyp/v8.gyp:v8',
'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
'deps/v8/src/v8.gyp:v8',
'deps/v8/src/v8.gyp:v8_libplatform'
],
}],
[ 'node_use_v8_platform=="true"', {
Expand Down Expand Up @@ -451,7 +451,7 @@
'defines': [ 'NODE_NO_BROWSER_GLOBALS' ],
} ],
[ 'node_use_bundled_v8=="true" and v8_postmortem_support=="true"', {
'dependencies': [ 'deps/v8/tools/gyp/v8.gyp:postmortem-metadata' ],
'dependencies': [ 'deps/v8/src/v8.gyp:postmortem-metadata' ],
'conditions': [
# -force_load is not applicable for the static library
[ 'node_target_type!="static_library"', {
Expand Down Expand Up @@ -856,13 +856,13 @@
}],
[ 'node_use_v8_platform=="true"', {
'dependencies': [
'deps/v8/tools/gyp/v8.gyp:v8_libplatform',
'deps/v8/src/v8.gyp:v8_libplatform',
],
}],
[ 'node_use_bundled_v8=="true"', {
'dependencies': [
'deps/v8/tools/gyp/v8.gyp:v8',
'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
'deps/v8/src/v8.gyp:v8',
'deps/v8/src/v8.gyp:v8_libplatform'
],
}],
]
Expand Down

0 comments on commit 2d7abd9

Please sign in to comment.