Permalink
Browse files

Link libev and libeio as a normal .o instead of as .a

Using WAF "staticlib" to compile libev tends to confuse it with a system
version. Thanks to mr.binary42 for helping debug.
  • Loading branch information...
1 parent 132d685 commit c77964760047f734c58dab49143ff6487f938c6e @ry ry committed Oct 27, 2009
Showing with 4 additions and 3 deletions.
  1. +1 −1 deps/libeio/wscript
  2. +1 −1 deps/libev/wscript
  3. +2 −1 wscript
View
@@ -108,7 +108,7 @@ def configure(conf):
""", define_name="HAVE_SYNC_FILE_RANGE")
def build(bld):
- libeio = bld.new_task_gen("cc", "staticlib")
+ libeio = bld.new_task_gen("cc")
libeio.source = "eio.c"
libeio.target = 'eio'
libeio.name = 'eio'
View
@@ -60,7 +60,7 @@ def configure(conf):
conf.env.append_value('CXXFLAGS', ['-DEV_MULTIPLICITY=0'])
def build(bld):
- libev = bld.new_task_gen("cc", "staticlib")
+ libev = bld.new_task_gen("cc")
libev.source = 'ev.c'
libev.target = 'ev'
libev.name = 'ev'
View
@@ -337,7 +337,8 @@ def build(bld):
deps/http_parser
deps/coupling
"""
- node.uselib_local = "evcom ev eio http_parser coupling"
+ node.add_objects = 'ev eio'
+ node.uselib_local = "evcom http_parser coupling"
node.uselib = "UDNS V8 EXECINFO DL"
node.install_path = '${PREFIX}/lib'
node.install_path = '${PREFIX}/bin'

0 comments on commit c779647

Please sign in to comment.