OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Integrate libuv into the build system

Browse Source
This commit is contained in:
Rob Arnold 2011-06-14 08:28:10 -07:00 committed by Brian Anderson
parent 904f443fa9
commit b64a52df42
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mk/rt.mk
View File

@ -65,9 +65,9 @@ RUNTIME_HDR := rt/globals.h \
RUNTIME_DEF := rt/rustrt$(CFG_DEF_SUFFIX) RUNTIME_DEF := rt/rustrt$(CFG_DEF_SUFFIX)
RUNTIME_INCS := -I $(S)src/rt/isaac -I $(S)src/rt/uthash \ RUNTIME_INCS := -I $(S)src/rt/isaac -I $(S)src/rt/uthash \
-I $(S)src/rt/arch/i386 -I $(S)src/rt/arch/i386 -I $(S)src/rt/libuv
RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o) $(RUNTIME_LL:.ll=.o) $(RUNTIME_S:.s=.o) RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o) $(RUNTIME_LL:.ll=.o) $(RUNTIME_S:.s=.o)
RUNTIME_LIBS := $(CFG_GCCISH_POST_LIB_FLAGS) RUNTIME_LIBS := $(S)src/rt/libuv/uv.a
rt/%.o: rt/%.cpp $(MKFILES) rt/%.o: rt/%.cpp $(MKFILES)
@ -92,9 +92,14 @@ rt/%.o: rt/%.ll $(MKFILES)
@$(call E, llc: $@) @$(call E, llc: $@)
$(Q)$(LLC) -filetype=obj -relocation-model=pic -march=x86 -o $@ $< $(Q)$(LLC) -filetype=obj -relocation-model=pic -march=x86 -o $@ $<
rt/$(CFG_RUNTIME): $(RUNTIME_OBJS) $(MKFILES) $(RUNTIME_HDR) $(RUNTIME_DEF) rt/$(CFG_RUNTIME): $(RUNTIME_OBJS) $(MKFILES) $(RUNTIME_HDR) $(RUNTIME_DEF) $(RUNTIME_LIBS)
@$(call E, link: $@) @$(call E, link: $@)
$(Q)$(call CFG_LINK_C,$@,$(RUNTIME_LIBS) $(RUNTIME_OBJS),$(RUNTIME_DEF)) $(Q)$(call CFG_LINK_C,$@,$(CFG_GCCISH_POST_LIB_FLAGS) $(RUNTIME_LIBS) $(RUNTIME_OBJS),$(RUNTIME_DEF))
$(S)src/rt/libuv/uv.a: rt/libuv/LIBUV_REVISION
$(Q)$(MAKE) -C $(S)src/rt/libuv CFLAGS=\"-m32\" LDFLAGS=\"-m32\"
$(Q)mkdir -p rt/libuv
$(Q)cp $(S)src/rt/libuv/uv.a rt/libuv/uv.a
# These could go in rt.mk or rustllvm.mk, they're needed for both. # These could go in rt.mk or rustllvm.mk, they're needed for both.

5
src/rt/libuv/LIBUV_REVISION Normal file
View File

@ -0,0 +1,5 @@
This subtree is pulled from:
2b5707d834a6b85b8e589ac04cb61a6db2dab94b
When pulling in a new version of libuv, please update this file to ensure that
everyone correctly rebuilds libuv.