diff --git a/deps/libuv b/deps/libuv index a21028aa7ebc7..0709538fecef5 160000 --- a/deps/libuv +++ b/deps/libuv @@ -1 +1 @@ -Subproject commit a21028aa7ebc7902e25472e9e7345b9b56067c33 +Subproject commit 0709538fecef54c67c84d446af7edddd3e4a1e99 diff --git a/src/Makefile b/src/Makefile index f20c57b4317fd..a1b35ac23dba9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,7 +15,7 @@ FLAGS = \ -I$(shell $(LLVM_CONFIG) --includedir) \ -I$(JULIAHOME)/deps/libuv/include -I$(JULIAHOME)/usr/include -LIBS = $(shell $(LLVM_CONFIG) --libfiles) $(WHOLE_ARCHIVE) $(WHOLE_ARCHIVE) $(JULIAHOME)/src/support/libsupport.a -L$(USR)/lib -luv $(OSLIBS) -lpthread $(shell $(LLVM_CONFIG) --ldflags) +LIBS = $(shell $(LLVM_CONFIG) --libfiles) $(WHOLE_ARCHIVE) $(WHOLE_ARCHIVE) $(JULIAHOME)/src/support/libsupport.a -L$(USRLIB) $(USRLIB)/libuv.a $(OSLIBS) -lpthread $(shell $(LLVM_CONFIG) --ldflags) ifneq ($(MAKECMDGOALS),debug) TARGET = diff --git a/ui/webserver/Makefile b/ui/webserver/Makefile index 32ec6063ac4e3..5d88a35ff7a8c 100644 --- a/ui/webserver/Makefile +++ b/ui/webserver/Makefile @@ -4,7 +4,7 @@ include $(JULIAHOME)/Make.inc override CFLAGS += $(JCFLAGS) override CXXFLAGS += $(JCXXFLAGS) -LIBS = -lpthread -L${USRLIB} -luv +LIBS = -lpthread ${USRLIB}/libuv.a ifeq ($(OS), Linux) LIBS += -lrt endif