---

yaml
---
r: 6066
b: refs/heads/master
c: 9303572
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df12749b361c7ea081826a9d58d0783cf4a391a0
+refs/heads/master: 93035722a47915793c75af79af8f39c9840a78c0

trunk/Makefile.in

@@ -103,8 +103,6 @@ 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,14 +38,6 @@ $$(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

@@ -38,24 +38,13 @@ $$(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) \