Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "build: support shared V8 properly"

This reverts commit 3d1b670.

Breaks build on windows.
https://gist.github.com/1895279
  • Loading branch information...
commit a9130222bd36ac2c5dd7ae560f02bb99569749a7 1 parent d3b8372
@isaacs isaacs authored
Showing with 3 additions and 18 deletions.
  1. +0 −3  configure
  2. +3 −15 node.gyp
View
3  configure
@@ -208,11 +208,8 @@ 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):
View
18 node.gyp
@@ -54,6 +54,7 @@
'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',
@@ -109,6 +110,8 @@
'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)',
@@ -144,21 +147,6 @@
],
}],
- [ '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',
Please sign in to comment.
Something went wrong with that request. Please try again.