bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use the driver to build stage3. This worked on all 3 platforms for me,

Browse source 
lets see if the bots agree.
This commit is contained in:
Rafael Ávila de Espíndola 2011-06-13 16:28:46 -04:00
parent a3be0454f9
commit ff8af3c2db
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
mk/stage3.mk
View file

@ -18,10 +18,6 @@ stage3/$(CFG_RUSTCLIB): stage3/librustc.o stage3/glue.o
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o $(CFG_GCCISH_LINK_FLAGS) \ $(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o $(CFG_GCCISH_LINK_FLAGS) \
-o $@ $< -Lstage3 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd -o $@ $< -Lstage3 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd
stage3/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
@$(call E, compile: $@)
$(STAGE2) -c -o $@ $<
stage3/glue.o: stage2/rustc$(X) stage2/$(CFG_STDLIB) stage2/intrinsics.bc \ stage3/glue.o: stage2/rustc$(X) stage2/$(CFG_STDLIB) stage2/intrinsics.bc \
rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
@$(call E, generate: $@) @$(call E, generate: $@)
@ -41,10 +37,9 @@ stage3/%.o: stage3/%.s
@$(call E, assemble [gcc]: $@) @$(call E, assemble [gcc]: $@)
$(Q)gcc $(CFG_GCCISH_CFLAGS) -o $@ -c $< $(Q)gcc $(CFG_GCCISH_CFLAGS) -o $@ -c $<
stage3/%$(X): stage3/%.o $(SREQ2) stage3/%$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
@$(call E, link [gcc]: $@) @$(call E, compile_and_link: $@)
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o -o $@ $< \ $(STAGE2) -o $@ $<
-Lstage3 -Lrustllvm -Lrt rt/main.o -lrustrt -lrustllvm -lstd -lm
@# dsymutil sometimes fails or prints a warning, but the @# dsymutil sometimes fails or prints a warning, but the
@# program still runs. Since it simplifies debugging other @# program still runs. Since it simplifies debugging other
@# programs, I\'ll live with the noise. @# programs, I\'ll live with the noise.