Browse Source

build: support shared V8 properly

-don't pull in bundled v8 as a dependency when node_shared_v8==true
-use node_shared_v8_includes for v8.h and v8-debug.h
v0.9.1-release
T.C. Hollingsworth 13 years ago
committed by Ben Noordhuis
parent
commit
3d1b670640
  1. 3
      configure
  2. 18
      node.gyp

3
configure

@ -208,8 +208,11 @@ def configure_v8(o):
o['libraries'] += ['-L%s' % options.shared_v8_libpath]
if options.shared_v8_libname:
o['libraries'] += ['-l%s' % options.shared_v8_libname]
elif options.shared_v8:
o['libraries'] += ['-lv8']
if options.shared_v8_includes:
o['include_dirs'] += [options.shared_v8_includes]
o['variables']['node_shared_v8_includes'] = options.shared_v8_includes
def configure_cares(o):

18
node.gyp

@ -54,7 +54,6 @@
'dependencies': [
'deps/http_parser/http_parser.gyp:http_parser',
'deps/v8/tools/gyp/v8.gyp:v8',
'deps/uv/uv.gyp:uv',
'deps/zlib/zlib.gyp:zlib',
'node_js2c#host',
@ -110,8 +109,6 @@
'src/stream_wrap.h',
'src/v8_typed_array.h',
'deps/http_parser/http_parser.h',
'deps/v8/include/v8.h',
'deps/v8/include/v8-debug.h',
'<(SHARED_INTERMEDIATE_DIR)/node_natives.h',
# javascript files to make for an even more pleasant IDE experience
'<@(library_files)',
@ -147,6 +144,21 @@
],
}],
[ 'node_shared_v8=="true"', {
'sources': [
'<(node_shared_v8_includes)/v8.h',
'<(node_shared_v8_includes)/v8-debug.h',
],
}],
[ 'node_shared_v8=="false"', {
'sources': [
'deps/v8/include/v8.h',
'deps/v8/include/v8-debug.h',
],
'dependencies': [ 'deps/v8/tools/gyp/v8.gyp:v8' ],
}],
[ 'OS=="win"', {
'sources': [
'tools/msvs/res/node.rc',

Loading…
Cancel
Save