From ff8af3c2db5e778dc9d8dad16538a2c38a124df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <respindola@mozilla.com>
Date: Mon, 13 Jun 2011 16:28:46 -0400
Subject: [PATCH] Use the driver to build stage3. This worked on all 3
 platforms for me, lets see if the bots agree.

---
 mk/stage3.mk | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/mk/stage3.mk b/mk/stage3.mk
index 3654c17aa44..2ad9cbb4cba 100644
--- a/mk/stage3.mk
+++ b/mk/stage3.mk
@@ -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) \
 	-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 \
                rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
 	@$(call E, generate: $@)
@@ -41,10 +37,9 @@ stage3/%.o: stage3/%.s
 	@$(call E, assemble [gcc]: $@)
 	$(Q)gcc $(CFG_GCCISH_CFLAGS) -o $@ -c $<
 
-stage3/%$(X): stage3/%.o  $(SREQ2)
-	@$(call E, link [gcc]: $@)
-	$(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o -o $@ $< \
-      -Lstage3 -Lrustllvm -Lrt rt/main.o -lrustrt -lrustllvm -lstd -lm
+stage3/%$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
+	@$(call E, compile_and_link: $@)
+	$(STAGE2) -o $@ $<
 	@# dsymutil sometimes fails or prints a warning, but the
 	@# program still runs.  Since it simplifies debugging other
 	@# programs, I\'ll live with the noise.