dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert part of my last change while I figure out why windows doesn't like it.

This commit is contained in:
Rafael Ávila de Espíndola 2011-06-14 15:55:51 -04:00
parent f24408d89a
commit 7b5c3afae5
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mk/tests.mk
View File

@ -200,13 +200,15 @@ compile-check: tidy \
@# programs, I\'ll live with the noise. @# programs, I\'ll live with the noise.
-$(Q)$(CFG_DSYMUTIL) $@ -$(Q)$(CFG_DSYMUTIL) $@
%.stage2$(X): %.rs $(SREQ2) %.stage2$(X): %.stage2.o $(SREQ2)
@$(call E, compile_and_link: $@) @$(call E, link [gcc]: $@)
$(STAGE2) -o $@ $< $(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o -o $@ $< \
-Lstage3 -Lrt rt/main.o -lrustrt -lstd -lm
@# dsymutil sometimes fails or prints a warning, but the
@# program still runs. Since it simplifies debugging other
@# programs, I\'ll live with the noise.
-$(Q)$(CFG_DSYMUTIL) $@
%.stage2$(X): %.rc $(SREQ2)
@$(call E, compile_and_link: $@)
$(STAGE2) -o $@ $<
%.stage0.o: %.rc $(SREQ0) %.stage0.o: %.rc $(SREQ0)
@$(call E, compile [stage0]: $@) @$(call E, compile [stage0]: $@)
@ -225,6 +227,15 @@ compile-check: tidy \
@$(call E, compile [stage1]: $@) @$(call E, compile [stage1]: $@)
$(STAGE1) -c -o $@ $< $(STAGE1) -c -o $@ $<
%.stage2.o: %.rc $(SREQ2)
@$(call E, compile [stage2]: $@)
$(STAGE2) -c -o $@ $<
%.stage2.o: %.rs $(SREQ2)
@$(call E, compile [stage2]: $@)
$(STAGE2) -c -o $@ $<
# Cancel the implicit .out rule in GNU make. # Cancel the implicit .out rule in GNU make.
%.out: % %.out: %