---

yaml
---
r: 2665
b: refs/heads/master
c: 02b995f
h: refs/heads/master
i:
  2663: 0cab580
v: v3

Author: erickt

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7341055b84cbda99a34fb6c307d1d4e3f887401e
+refs/heads/master: 02b995f428ffd66ab72e13f804cdd5ad80fefa7a

trunk/mk/stage1.mk

@@ -16,7 +16,7 @@ stage1/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
 stage1/$(CFG_RUSTCLIB): stage1/librustc.o stage1/glue.o
 	@$(call E, link: $@)
 	$(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o $(CFG_GCCISH_LINK_FLAGS) \
-	-o $@ $< -Lstage1 -Lrt -lrustrt
+	-o $@ $< -Lstage1 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd
 
 stage1/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
 	@$(call E, compile: $@)

trunk/mk/stage2.mk

@@ -16,7 +16,7 @@ stage2/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)
 stage2/$(CFG_RUSTCLIB): stage2/librustc.o stage2/glue.o
 	@$(call E, link: $@)
 	$(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o $(CFG_GCCISH_LINK_FLAGS) \
-	-o $@ $< -Lstage2 -Lrt -lrustrt
+	-o $@ $< -Lstage2 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd
 
 stage2/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)
 	@$(call E, compile: $@)

trunk/mk/stage3.mk

@@ -16,7 +16,7 @@ stage3/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
 stage3/$(CFG_RUSTCLIB): stage3/librustc.o stage3/glue.o
 	@$(call E, link: $@)
 	$(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o $(CFG_GCCISH_LINK_FLAGS) \
-	-o $@ $< -Lstage3 -Lrt -lrustrt
+	-o $@ $< -Lstage3 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd
 
 stage3/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
 	@$(call E, compile: $@)