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

Move glue.o to stageN/lib.

This commit is contained in:
Rafael Ávila de Espíndola 2011-06-28 15:20:43 -04:00
parent 926049eddd
commit d5fc01caef
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mk/stage1.mk
View File

@ -4,11 +4,14 @@ stage1/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
@$(call E, compile_and_link: $@) @$(call E, compile_and_link: $@)
$(STAGE1) --shared -o $@ $< $(STAGE1) --shared -o $@ $<
stage1/glue.o: stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) stage1/intrinsics.bc \ stage1/lib/glue.o: stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) \
$(LREQ) $(MKFILES) stage1/intrinsics.bc $(LREQ) $(MKFILES)
@$(call E, generate: $@) @$(call E, generate: $@)
$(STAGE1) -c -o $@ --glue $(STAGE1) -c -o $@ --glue
stage1/glue.o: stage1/lib/glue.o
cp stage1/lib/glue.o stage1/glue.o
stage1/intrinsics.bc: $(INTRINSICS_BC) stage1/intrinsics.bc: $(INTRINSICS_BC)
@$(call E, cp: $@) @$(call E, cp: $@)
$(Q)cp $< $@ $(Q)cp $< $@

7
mk/stage2.mk
View File

@ -4,11 +4,14 @@ stage2/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
@$(call E, compile_and_link: $@) @$(call E, compile_and_link: $@)
$(STAGE2) --shared -o $@ $< $(STAGE2) --shared -o $@ $<
stage2/glue.o: stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) stage2/intrinsics.bc \ stage2/lib/glue.o: stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) \
rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME) stage2/intrinsics.bc rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
@$(call E, generate: $@) @$(call E, generate: $@)
$(STAGE2) -c -o $@ --glue $(STAGE2) -c -o $@ --glue
stage2/glue.o: stage2/lib/glue.o
cp stage2/lib/glue.o stage2/glue.o
stage2/intrinsics.bc: $(INTRINSICS_BC) stage2/intrinsics.bc: $(INTRINSICS_BC)
@$(call E, cp: $@) @$(call E, cp: $@)
$(Q)cp $< $@ $(Q)cp $< $@

7
mk/stage3.mk
View File

@ -4,11 +4,14 @@ stage3/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
@$(call E, compile_and_link: $@) @$(call E, compile_and_link: $@)
$(STAGE3) --shared -o $@ $< $(STAGE3) --shared -o $@ $<
stage3/glue.o: stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) stage3/intrinsics.bc \ stage3/lib/glue.o: stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) \
rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME) stage3/intrinsics.bc rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
@$(call E, generate: $@) @$(call E, generate: $@)
$(STAGE3) -c -o $@ --glue $(STAGE3) -c -o $@ --glue
stage3/glue.o: stage3/lib/glue.o
cp stage3/lib/glue.o stage3/glue.o
stage3/intrinsics.bc: $(INTRINSICS_BC) stage3/intrinsics.bc: $(INTRINSICS_BC)
@$(call E, cp: $@) @$(call E, cp: $@)
$(Q)cp $< $@ $(Q)cp $< $@

2
src/comp/driver/rustc.rs
View File

@ -393,7 +393,7 @@ fn main(vec[str] args) {
// //
// TODO: Factor this out of main. // TODO: Factor this out of main.
if (sopts.output_type == link::output_type_exe) { if (sopts.output_type == link::output_type_exe) {
let str glu = binary_dir + "/glue.o"; let str glu = binary_dir + "/lib/glue.o";
let str main = "rt/main.o"; let str main = "rt/main.o";
let str stage = "-L" + binary_dir + "/lib"; let str stage = "-L" + binary_dir + "/lib";
let vec[str] gcc_args; let vec[str] gcc_args;