From d5fc01caefed33c9633e8d26f4901f3e34a21f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <respindola@mozilla.com>
Date: Tue, 28 Jun 2011 15:20:43 -0400
Subject: [PATCH] Move glue.o to stageN/lib.

---
 mk/stage1.mk             | 7 +++++--
 mk/stage2.mk             | 7 +++++--
 mk/stage3.mk             | 7 +++++--
 src/comp/driver/rustc.rs | 2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/mk/stage1.mk b/mk/stage1.mk
index 99d21a8139e..a7a5e4b1c0d 100644
--- a/mk/stage1.mk
+++ b/mk/stage1.mk
@@ -4,11 +4,14 @@ stage1/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
 	@$(call E, compile_and_link: $@)
 	$(STAGE1)  --shared -o $@ $<
 
-stage1/glue.o: stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) stage1/intrinsics.bc \
-               $(LREQ) $(MKFILES)
+stage1/lib/glue.o: stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) \
+	stage1/intrinsics.bc $(LREQ) $(MKFILES)
 	@$(call E, generate: $@)
 	$(STAGE1) -c -o $@ --glue
 
+stage1/glue.o: stage1/lib/glue.o
+	cp stage1/lib/glue.o stage1/glue.o
+
 stage1/intrinsics.bc:	$(INTRINSICS_BC)
 	@$(call E, cp: $@)
 	$(Q)cp $< $@
diff --git a/mk/stage2.mk b/mk/stage2.mk
index 25eea31ca4b..12d1cad400f 100644
--- a/mk/stage2.mk
+++ b/mk/stage2.mk
@@ -4,11 +4,14 @@ stage2/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
 	@$(call E, compile_and_link: $@)
 	$(STAGE2)  --shared -o $@ $<
 
-stage2/glue.o: stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) stage2/intrinsics.bc \
-               rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
+stage2/lib/glue.o: stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) \
+	stage2/intrinsics.bc rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
 	@$(call E, generate: $@)
 	$(STAGE2) -c -o $@ --glue
 
+stage2/glue.o: stage2/lib/glue.o
+	cp stage2/lib/glue.o stage2/glue.o
+
 stage2/intrinsics.bc:	$(INTRINSICS_BC)
 	@$(call E, cp: $@)
 	$(Q)cp $< $@
diff --git a/mk/stage3.mk b/mk/stage3.mk
index 34ac75a39e9..dfc7eff2190 100644
--- a/mk/stage3.mk
+++ b/mk/stage3.mk
@@ -4,11 +4,14 @@ stage3/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
 	@$(call E, compile_and_link: $@)
 	$(STAGE3)  --shared -o $@ $<
 
-stage3/glue.o: stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) stage3/intrinsics.bc \
-               rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
+stage3/lib/glue.o: stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) \
+	 stage3/intrinsics.bc rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
 	@$(call E, generate: $@)
 	$(STAGE3) -c -o $@ --glue
 
+stage3/glue.o: stage3/lib/glue.o
+	cp stage3/lib/glue.o stage3/glue.o
+
 stage3/intrinsics.bc:	$(INTRINSICS_BC)
 	@$(call E, cp: $@)
 	$(Q)cp $< $@
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index bed3ba3492c..7c035f84ae8 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -393,7 +393,7 @@ fn main(vec[str] args) {
     //
     // TODO: Factor this out of main.
     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 stage = "-L" + binary_dir + "/lib";
         let vec[str] gcc_args;