---

yaml
---
r: 2455
b: refs/heads/master
c: 9a12ad6
h: refs/heads/master
i:
  2453: 2428155
  2451: b6f06ad
  2447: 61eea3f
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5ea56c6f09c885d2bc9598419456c221ebb6831
+refs/heads/master: 9a12ad62f6bc0ea9ec1164519d1b922642ab34d2

trunk/Makefile.in

@@ -37,6 +37,7 @@ include $(CFG_SRC_DIR)/mk/platform.mk
 CFG_RUNTIME :=$(call CFG_LIB_NAME,rustrt)
 CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm)
 CFG_STDLIB :=$(call CFG_LIB_NAME,std)
+CFG_RUSTCLIB :=$(call CFG_LIB_NAME,rustc)
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git

trunk/mk/stage1.mk

@@ -9,6 +9,15 @@ stage1/$(CFG_STDLIB): stage1/std.o stage1/glue.o
 	$(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o $(CFG_GCCISH_LINK_FLAGS) \
         -o $@ $< -Lstage1 -Lrt -lrustrt
 
+stage1/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
+	@$(call E, compile: $@)
+	$(STAGE0) -c --shared -o $@ $<
+
+stage1/$(CFG_RUSTCLIB): stage1/librustc.o stage1/glue.o
+	@$(call E, link: $@)
+	$(Q)gcc $(CFG_GCC_CFLAGS) stage1/glue.o $(CFG_GCC_LINK_FLAGS) -o $@ $< \
+		-Lstage1 -Lrt -lrustrt
+
 stage1/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
 	@$(call E, compile: $@)
 	$(STAGE0) -c -o $@ $<

trunk/mk/stage2.mk

@@ -9,6 +9,15 @@ stage2/$(CFG_STDLIB): stage2/std.o stage2/glue.o
 	$(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o $(CFG_GCCISH_LINK_FLAGS) -o \
         $@ $< -Lstage2 -Lrt -lrustrt
 
+stage2/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)
+	@$(call E, compile: $@)
+	$(STAGE1) -c --shared -o $@ $<
+
+stage2/$(CFG_RUSTCLIB): stage2/librustc.o stage2/glue.o
+	@$(call E, link: $@)
+	$(Q)gcc $(CFG_GCC_CFLAGS) stage2/glue.o $(CFG_GCC_LINK_FLAGS) -o $@ $< \
+		-Lstage2 -Lrt -lrustrt
+
 stage2/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)
 	@$(call E, compile: $@)
 	$(STAGE1) -c -o $@ $<

trunk/mk/stage3.mk

@@ -9,6 +9,15 @@ stage3/$(CFG_STDLIB): stage3/std.o stage3/glue.o
 	$(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o $(CFG_GCCISH_LINK_FLAGS) -o \
         $@ $< -Lstage3 -Lrt -lrustrt
 
+stage3/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
+	@$(call E, compile: $@)
+	$(STAGE2) -c --shared -o $@ $<
+
+stage3/$(CFG_RUSTCLIB): stage3/librustc.o stage3/glue.o
+	@$(call E, link: $@)
+	$(Q)gcc $(CFG_GCC_CFLAGS) stage3/glue.o $(CFG_GCC_LINK_FLAGS) -o $@ $< \
+		-Lstage3 -Lrt -lrustrt
+
 stage3/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
 	@$(call E, compile: $@)
 	$(STAGE2) -c -o $@ $<