deps: upgrade libuv to 47b2cd3
This commit is contained in:
parent
4eb5399bb2
commit
d7c45ea7d0
10
deps/uv/Makefile
vendored
10
deps/uv/Makefile
vendored
@ -35,15 +35,15 @@ endif
|
||||
TESTS=test/blackhole-server.c test/echo-server.c test/test-*.c
|
||||
BENCHMARKS=test/blackhole-server.c test/echo-server.c test/dns-server.c test/benchmark-*.c
|
||||
|
||||
all: uv.a
|
||||
all: libuv.a
|
||||
|
||||
test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) uv.a
|
||||
test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) libuv.a
|
||||
$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-tests test/run-tests.c \
|
||||
test/runner.c $(RUNNER_SRC) $(TESTS) uv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
|
||||
test/runner.c $(RUNNER_SRC) $(TESTS) libuv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
|
||||
|
||||
test/run-benchmarks$(E): test/*.h test/run-benchmarks.c test/runner.c $(RUNNER_SRC) $(BENCHMARKS) uv.a
|
||||
test/run-benchmarks$(E): test/*.h test/run-benchmarks.c test/runner.c $(RUNNER_SRC) $(BENCHMARKS) libuv.a
|
||||
$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-benchmarks test/run-benchmarks.c \
|
||||
test/runner.c $(RUNNER_SRC) $(BENCHMARKS) uv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
|
||||
test/runner.c $(RUNNER_SRC) $(BENCHMARKS) libuv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
|
||||
|
||||
test/echo.o: test/echo.c test/echo.h
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -c test/echo.c -o test/echo.o
|
||||
|
4
deps/uv/config-mingw.mk
vendored
4
deps/uv/config-mingw.mk
vendored
@ -35,8 +35,8 @@ RUNNER_LINKFLAGS=$(LINKFLAGS)
|
||||
RUNNER_LIBS=-lws2_32 -lpsapi -liphlpapi
|
||||
RUNNER_SRC=test/runner-win.c
|
||||
|
||||
uv.a: $(WIN_OBJS) src/fs-poll.o src/inet.o src/uv-common.o
|
||||
$(AR) rcs uv.a $^
|
||||
libuv.a: $(WIN_OBJS) src/fs-poll.o src/inet.o src/uv-common.o
|
||||
$(AR) rcs $@ $^
|
||||
|
||||
src/%.o: src/%.c include/uv.h include/uv-private/uv-win.h
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
|
4
deps/uv/config-unix.mk
vendored
4
deps/uv/config-unix.mk
vendored
@ -128,8 +128,8 @@ endif
|
||||
RUNNER_LIBS=
|
||||
RUNNER_SRC=test/runner-unix.c
|
||||
|
||||
uv.a: $(OBJS) src/fs-poll.o src/inet.o src/uv-common.o src/unix/ev/ev.o
|
||||
$(AR) rcs uv.a $^
|
||||
libuv.a: $(OBJS) src/fs-poll.o src/inet.o src/uv-common.o src/unix/ev/ev.o
|
||||
$(AR) rcs $@ $^
|
||||
|
||||
src/%.o: src/%.c include/uv.h include/uv-private/uv-unix.h
|
||||
$(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
|
||||
|
6
deps/uv/uv.gyp
vendored
6
deps/uv/uv.gyp
vendored
@ -22,7 +22,7 @@
|
||||
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'uv',
|
||||
'target_name': 'libuv',
|
||||
'type': '<(library)',
|
||||
'include_dirs': [
|
||||
'include',
|
||||
@ -236,7 +236,7 @@
|
||||
{
|
||||
'target_name': 'run-tests',
|
||||
'type': 'executable',
|
||||
'dependencies': [ 'uv' ],
|
||||
'dependencies': [ 'libuv' ],
|
||||
'sources': [
|
||||
'test/blackhole-server.c',
|
||||
'test/echo-server.c',
|
||||
@ -357,7 +357,7 @@
|
||||
{
|
||||
'target_name': 'run-benchmarks',
|
||||
'type': 'executable',
|
||||
'dependencies': [ 'uv' ],
|
||||
'dependencies': [ 'libuv' ],
|
||||
'sources': [
|
||||
'test/benchmark-async.c',
|
||||
'test/benchmark-async-pummel.c',
|
||||
|
Loading…
x
Reference in New Issue
Block a user