---

yaml
---
r: 6063
b: refs/heads/master
c: 86459b3
h: refs/heads/master
i:
  6061: 297a054
  6059: f8a77a3
  6055: 9db1b0c
  6047: c082c23
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1cc00fef56df47d84fff6b3dfd0fd4df445841f
+refs/heads/master: 86459b3517772a466f55d4bcc33dd972e1f7326c

trunk/Makefile.in

@@ -103,6 +103,8 @@ endif
 CFG_RUNTIME :=$(call CFG_LIB_NAME,rustrt)
 CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm)
 CFG_STDLIB :=$(call CFG_LIB_NAME,ruststd)
+# FIXME: temporary
+CFG_OLDSTDLIB :=$(call CFG_LIB_NAME,std)
 CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc)
 
 # version-string calculation

trunk/mk/host.mk

@@ -38,6 +38,14 @@ $$(HOST_LIB$(2))/$$(CFG_STDLIB): \
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$< $$@
 
+# FIXME: temporary
+ifeq ($(2),0)
+$$(HOST_LIB$(2))/$$(CFG_OLDSTDLIB): \
+	$$(HOST_LIB$(2))/$$(CFG_STDLIB)
+	@$$(call E, cp: $$@)
+	$$(Q)cp $$< $$@
+endif
+
 $$(HOST_LIB$(2))/libstd.rlib: \
 	$$(TARGET_HOST_LIB$(1))/libstd.rlib \
 	$$(HOST_LIB$(2))/$$(CFG_RUNTIME)

trunk/mk/target.mk

@@ -17,6 +17,13 @@ $$(TARGET_LIB$(1)$(2))/$$(CFG_STDLIB): \
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1))  --lib -o $$@ $$<
 
+ifeq ($(1), 0)
+# FIXME: temporary
+$$(TARGET_LIB$(1)$(2))/$$(CFG_OLDSTDLIB): $$(TARGET_LIB$(1)$(2))/$$(CFG_STDLIB)
+	@$$(call E, cp: $$@)
+	$$(Q)cp $$< $$@
+endif
+
 $$(TARGET_LIB$(1)$(2))/libstd.rlib: \
 	$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
         $$(TARGET_SREQ$(1)$(2))
@@ -31,13 +38,24 @@ $$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM): rustllvm/$$(CFG_RUSTLLVM)
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$< $$@
 
+ifeq ($(1), 0)
+$$(TARGET_BIN$(1)$(2))/rustc$$(X): \
+	$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
+	$$(TARGET_SREQ$(1)$(2)) \
+	$$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM) \
+	$$(TARGET_STDLIB_DEFAULT$(1)$(2)) \
+	$$(TARGET_LIB$(1)$(2))/$$(CFG_OLDSTDLIB)
+	@$$(call E, compile_and_link: $$@)
+	$$(STAGE$(1)) -o $$@ $$<
+else
 $$(TARGET_BIN$(1)$(2))/rustc$$(X): \
 	$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
 	$$(TARGET_SREQ$(1)$(2)) \
 	$$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM) \
 	$$(TARGET_STDLIB_DEFAULT$(1)$(2))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)) -o $$@ $$<
+endif
 
 $$(TARGET_LIB$(1)$(2))/$$(CFG_LIBRUSTC): \
 	$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \