From 86459b3517772a466f55d4bcc33dd972e1f7326c Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 31 Oct 2011 13:16:54 -0700
Subject: [PATCH] Add some transitional build rules for moving libstd.so to
 libruststd.so

---
 Makefile.in  |  2 ++
 mk/host.mk   |  8 ++++++++
 mk/target.mk | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index 648acee5263..744bb8ccb36 100644
--- a/Makefile.in
+++ b/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
diff --git a/mk/host.mk b/mk/host.mk
index 31e995d22c6..8b8c7961da2 100644
--- a/mk/host.mk
+++ b/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)
diff --git a/mk/target.mk b/mk/target.mk
index 16ebf1eeb7c..1dc59e9f8e3 100644
--- a/mk/target.mk
+++ b/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,6 +38,16 @@ $$(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)) \
@@ -38,6 +55,7 @@ $$(TARGET_BIN$(1)$(2))/rustc$$(X): \
 	$$(TARGET_STDLIB_DEFAULT$(1)$(2))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)) -o $$@ $$<
+endif
 
 $$(TARGET_LIB$(1)$(2))/$$(CFG_LIBRUSTC): \
 	$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \