Skip to content

Commit 122e74b

Browse files
committed
Link to objects instead of shlibs for evcom, http_parser, coupling
1 parent 5f466c8 commit 122e74b

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

wscript

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ def build_v8(bld):
232232
bld.env["CPPPATH_V8"] = "deps/v8/include"
233233
bld.env_of_name('default')["STATICLIB_V8"] = "v8"
234234
bld.env_of_name('default')["LINKFLAGS_V8"] = ["-pthread"]
235+
bld.env_of_name('default')["LIBPATH_V8"] = bld.srcnode.abspath(bld.env_of_name("default"))
235236

236237
### v8 debug
237238
if bld.env["USE_DEBUG"]:
@@ -241,6 +242,7 @@ def build_v8(bld):
241242
v8_debug.uselib = "EXECINFO"
242243
bld.env_of_name('debug')["STATICLIB_V8"] = "v8_g"
243244
bld.env_of_name('debug')["LINKFLAGS_V8"] = ["-pthread"]
245+
bld.env_of_name('debug')["LIBPATH_V8"] = bld.srcnode.abspath(bld.env_of_name("debug"))
244246

245247
bld.install_files('${PREFIX}/include/node/', 'deps/v8/include/*.h')
246248

@@ -251,7 +253,7 @@ def build(bld):
251253
build_v8(bld)
252254

253255
### evcom
254-
evcom = bld.new_task_gen("cc", "staticlib")
256+
evcom = bld.new_task_gen("cc")
255257
evcom.source = "deps/evcom/evcom.c"
256258
evcom.includes = "deps/evcom/ deps/libev/"
257259
evcom.name = "evcom"
@@ -263,7 +265,7 @@ def build(bld):
263265
bld.install_files('${PREFIX}/include/node/', 'deps/evcom/evcom.h')
264266

265267
### http_parser
266-
http_parser = bld.new_task_gen("cc", "staticlib")
268+
http_parser = bld.new_task_gen("cc")
267269
http_parser.source = "deps/http_parser/http_parser.c"
268270
http_parser.includes = "deps/http_parser/"
269271
http_parser.name = "http_parser"
@@ -273,7 +275,7 @@ def build(bld):
273275
http_parser.clone("debug")
274276

275277
### coupling
276-
coupling = bld.new_task_gen("cc", "staticlib")
278+
coupling = bld.new_task_gen("cc")
277279
coupling.source = "deps/coupling/coupling.c"
278280
coupling.includes = "deps/coupling/"
279281
coupling.name = "coupling"
@@ -337,9 +339,9 @@ def build(bld):
337339
deps/http_parser
338340
deps/coupling
339341
"""
340-
node.add_objects = 'ev eio'
341-
node.uselib_local = "evcom http_parser coupling"
342-
node.uselib = "UDNS V8 EXECINFO DL"
342+
node.add_objects = 'ev eio evcom http_parser coupling'
343+
node.uselib_local = ''
344+
node.uselib = 'UDNS V8 EXECINFO DL'
343345
node.install_path = '${PREFIX}/lib'
344346
node.install_path = '${PREFIX}/bin'
345347
node.chmod = 0755

0 commit comments

Comments
 (0)