---

yaml
---
r: 3678
b: refs/heads/master
c: e440781
h: refs/heads/master
v: v3

Author: cixtor

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e2fff53375eba748b6d6727f69a2560f96bc8ec
+refs/heads/master: e4407811642f87b5e2bcf0a75cef3a7baef88414

trunk/mk/snap.mk

@@ -1,10 +1,13 @@
 
-snap-stage1: stage1/rustc$(X) stage1/glue.o stage1/lib/$(CFG_STDLIB)
+snap-stage1: stage1/rustc$(X) stage1/glue.o stage1/lib/$(CFG_STDLIB) \
+	stage1/lib/libstd.rlib
 	$(S)src/etc/make-snapshot.py stage1
 
-snap-stage2: stage2/rustc$(X) stage2/glue.o stage2/lib/$(CFG_STDLIB)
+snap-stage2: stage2/rustc$(X) stage2/glue.o stage2/lib/$(CFG_STDLIB) \
+	stage2/lib/libstd.rlib
 	$(S)src/etc/make-snapshot.py stage2
 
-snap-stage3: stage3/rustc$(X) stage3/glue.o stage3/lib/$(CFG_STDLIB)
+snap-stage3: stage3/rustc$(X) stage3/glue.o stage3/lib/$(CFG_STDLIB) \
+	stage3/lib/libstd.rlib
 	$(S)src/etc/make-snapshot.py stage3
 

trunk/mk/stage1.mk

@@ -4,6 +4,12 @@ stage1/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
 	@$(call E, compile_and_link: $@)
 	$(STAGE1) --lib -o $@ $<
 
+stage1/lib/libstd.rlib:  $(STDLIB_CRATE) $(STDLIB_INPUTS) \
+              stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) stage1/intrinsics.bc \
+              stage1/glue.o $(LREQ) $(MKFILES)
+	@$(call E, compile_and_link: $@)
+	$(STAGE1) --lib --static -o $@ $<
+
 stage1/lib/glue.o: stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) \
 	stage1/intrinsics.bc $(LREQ) $(MKFILES)
 	@$(call E, generate: $@)

trunk/mk/stage2.mk

@@ -4,6 +4,12 @@ stage2/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
 	@$(call E, compile_and_link: $@)
 	$(STAGE2)  --lib -o $@ $<
 
+stage2/lib/libstd.rlib:  $(STDLIB_CRATE) $(STDLIB_INPUTS) \
+              stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) stage2/intrinsics.bc \
+              stage2/glue.o $(LREQ) $(MKFILES)
+	@$(call E, compile_and_link: $@)
+	$(STAGE2) --lib --static -o $@ $<
+
 stage2/lib/glue.o: stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) \
 	stage2/intrinsics.bc rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
 	@$(call E, generate: $@)

trunk/mk/stage3.mk

@@ -4,6 +4,12 @@ stage3/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
 	@$(call E, compile_and_link: $@)
 	$(STAGE3)  --lib -o $@ $<
 
+stage3/lib/libstd.rlib:  $(STDLIB_CRATE) $(STDLIB_INPUTS) \
+              stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) stage3/intrinsics.bc \
+              stage3/glue.o $(LREQ) $(MKFILES)
+	@$(call E, compile_and_link: $@)
+	$(STAGE3) --lib --static -o $@ $<
+
 stage3/lib/glue.o: stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) \
 	 stage3/intrinsics.bc rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
 	@$(call E, generate: $@)