bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Updating to build on Linux and Mac, and hopefully Windows too.

Browse source
This commit is contained in:
Eric Holk 2011-08-11 12:26:23 -07:00
parent b2dad8af31
commit a332043561
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mk/rt.mk
View file

@ -33,7 +33,7 @@ RUNTIME_CS := rt/sync/timer.cpp \
RUNTIME_LL := RUNTIME_LL :=
RUNTIME_S := rt/arch/i386/_context.s RUNTIME_S := rt/arch/i386/_context.S
RUNTIME_HDR := rt/globals.h \ RUNTIME_HDR := rt/globals.h \
rt/rust.h \ rt/rust.h \
@ -67,14 +67,14 @@ 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/libuv/include -I $(S)src/rt/arch/i386 -I $(S)src/rt/libuv/include
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 := rt/libuv/uv.a RUNTIME_LIBS := rt/libuv/uv.a
rt/%.o: rt/%.cpp $(MKFILES) rt/%.o: rt/%.cpp $(MKFILES)
@$(call E, compile: $@) @$(call E, compile: $@)
$(Q)$(call CFG_COMPILE_C, $@, $(RUNTIME_INCS)) $< $(Q)$(call CFG_COMPILE_C, $@, $(RUNTIME_INCS)) $<
rt/%.o: rt/%.s $(MKFILES) rt/%.o: rt/%.S $(MKFILES)
@$(call E, compile: $@) @$(call E, compile: $@)
$(Q)$(call CFG_COMPILE_C, $@, $(RUNTIME_INCS)) $< $(Q)$(call CFG_COMPILE_C, $@, $(RUNTIME_INCS)) $<

4
src/rt/arch/i386/_context.s → src/rt/arch/i386/_context.S
View file

@ -78,4 +78,8 @@ swap_registers:
.globl task_trampoline .globl task_trampoline
task_trampoline: task_trampoline:
// This gets set up by std::task::_spawn. // This gets set up by std::task::_spawn.
#ifdef __APPLE__
call _task_exit call _task_exit
#else
call task_exit
#endif