update libuv to fix windows spawn support

JuliaLang · Nov 24, 2012 · 75cb6c3 · 75cb6c3
1 parent dd28c29
commit 75cb6c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/deps/libuv b/deps/libuv
diff --git 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
@@ -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