---

yaml
---
r: 3413
b: refs/heads/master
c: d5fc01c
h: refs/heads/master
i:
  3411: b489526
v: v3

Author: cixtor

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 926049edddb6a990f22658205a2f3d467d0e4475
+refs/heads/master: d5fc01caefed33c9633e8d26f4901f3e34a21f48

trunk/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 $< $@

trunk/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 $< $@

trunk/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 $< $@

trunk/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;