Skip to content

Commit a913022

Browse files
committed
Revert "build: support shared V8 properly"
This reverts commit 3d1b670. Breaks build on windows. https://gist.github.com/1895279
1 parent d3b8372 commit a913022

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

configure

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,8 @@ def configure_v8(o):
208208
o['libraries'] += ['-L%s' % options.shared_v8_libpath]
209209
if options.shared_v8_libname:
210210
o['libraries'] += ['-l%s' % options.shared_v8_libname]
211-
elif options.shared_v8:
212-
o['libraries'] += ['-lv8']
213211
if options.shared_v8_includes:
214212
o['include_dirs'] += [options.shared_v8_includes]
215-
o['variables']['node_shared_v8_includes'] = options.shared_v8_includes
216213

217214

218215
def configure_cares(o):

node.gyp

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454

5555
'dependencies': [
5656
'deps/http_parser/http_parser.gyp:http_parser',
57+
'deps/v8/tools/gyp/v8.gyp:v8',
5758
'deps/uv/uv.gyp:uv',
5859
'deps/zlib/zlib.gyp:zlib',
5960
'node_js2c#host',
@@ -109,6 +110,8 @@
109110
'src/stream_wrap.h',
110111
'src/v8_typed_array.h',
111112
'deps/http_parser/http_parser.h',
113+
'deps/v8/include/v8.h',
114+
'deps/v8/include/v8-debug.h',
112115
'<(SHARED_INTERMEDIATE_DIR)/node_natives.h',
113116
# javascript files to make for an even more pleasant IDE experience
114117
'<@(library_files)',
@@ -144,21 +147,6 @@
144147
],
145148
}],
146149

147-
[ 'node_shared_v8=="true"', {
148-
'sources': [
149-
'<(node_shared_v8_includes)/v8.h',
150-
'<(node_shared_v8_includes)/v8-debug.h',
151-
],
152-
}],
153-
154-
[ 'node_shared_v8=="false"', {
155-
'sources': [
156-
'deps/v8/include/v8.h',
157-
'deps/v8/include/v8-debug.h',
158-
],
159-
'dependencies': [ 'deps/v8/tools/gyp/v8.gyp:v8' ],
160-
}],
161-
162150
[ 'OS=="win"', {
163151
'sources': [
164152
'tools/msvs/res/node.rc',

0 commit comments

Comments
 (0)