Commit 369fee63 authored by Jason Madden's avatar Jason Madden

fix linking non-embedded libuv test case.

parent bb329a81
......@@ -189,5 +189,5 @@ test-py27-cffi: $(PY27)
test-py27-noembed: $(PY27)
cd deps/libev && ./configure --disable-dependency-tracking && make
cd deps/c-ares && ./configure --disable-dependency-tracking && make
cd deps/libuv && ./autogen.sh && ./configure && make
cd deps/libuv && ./autogen.sh && ./configure --disable-static && make
CPPFLAGS="-Ideps/libev -Ideps/c-ares -Ideps/libuv/include" LDFLAGS="-Ldeps/libev/.libs -Ldeps/c-ares/.libs -Ldeps/libuv/.libs" LD_LIBRARY_PATH="$(PWD)/deps/libev/.libs:$(PWD)/deps/c-ares/.libs:$(PWD)/deps/libuv/.libs" EMBED=0 GEVENT_CORE_CEXT_ONLY=1 PYTHON=python2.7 PATH=$(BUILD_RUNTIMES)/versions/python2.7/bin:$(PATH) make develop toxtest
......@@ -69,16 +69,22 @@ library_dirs = [
os.path.join(libuv_dir, '.libs')
]
# XXX: This is all duplicated from _setuplibuv.py
if sys.platform.startswith('win'):
libuv_lib = os.path.join(libuv_dir, 'Release', 'lib', 'libuv.lib')
extra_link_args = ['/NODEFAULTLIB:libcmt', '/LTCG']
extra_objects = [libuv_lib]
else:
libuv_lib = os.path.join(libuv_dir, '.libs', 'libuv.a')
extra_objects = [libuv_lib]
extra_link_args = []
LIBUV_LIBRARIES = []
if os.path.exists(libuv_lib):
extra_objects = [libuv_lib]
else:
# Must be non-embedded
extra_objects = []
LIBUV_LIBRARIES = ['uv']
if sys.platform.startswith('linux'):
LIBUV_LIBRARIES.append('rt')
elif sys.platform.startswith("win"):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment