From b01ecb10c3911254cd20527a5328bac7a619fca9 Mon Sep 17 00:00:00 2001
From: Michael Sullivan <sully@msully.net>
Date: Thu, 21 Jul 2011 11:58:01 -0700
Subject: [PATCH] Instantiate the stage0/lib/stdlib rules from stage0.mk
 instead of stageN.mk.

---
 Makefile.in  | 4 ++--
 mk/stage0.mk | 6 ++++--
 mk/stageN.mk | 4 ----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a4d8f2b6b61..cc265795ce8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -226,8 +226,8 @@ config.mk: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
 ######################################################################
 
 include $(CFG_SRC_DIR)/mk/intrinsics.mk
-include $(CFG_SRC_DIR)/mk/stage0.mk
 include $(CFG_SRC_DIR)/mk/stageN.mk
+include $(CFG_SRC_DIR)/mk/stage0.mk
 include $(CFG_SRC_DIR)/mk/rt.mk
 include $(CFG_SRC_DIR)/mk/rustllvm.mk
 include $(CFG_SRC_DIR)/mk/autodep.mk
@@ -269,4 +269,4 @@ endif
 ifneq ($(findstring clean,$(MAKECMDGOALS)),)
   CFG_INFO := $(info cfg: including clean rules)
   include $(CFG_SRC_DIR)/mk/clean.mk
-endif
\ No newline at end of file
+endif
diff --git a/mk/stage0.mk b/mk/stage0.mk
index ec83f163b2b..c125e4a9faf 100644
--- a/mk/stage0.mk
+++ b/mk/stage0.mk
@@ -35,6 +35,8 @@ stage0/lib/main.o: rt/main.o
 stage0/lib/$(CFG_RUNTIME): stage0/rustc$(X)
 	$(Q)touch $@
 
-# stage0/lib/$(CFG_STDLIB) and stage0/lib/libstd.rlib rules are generated
-# in stageN.mk
+# Instantiate template (in stageN.mk) for building
+# stage0/lib/$(CFG_STDLIB) and stage0/lib/libstd.rlib.
+SREQpre = stage0/lib/main.o $(MKFILES)
+$(eval $(call STDLIBGEN,pre,0))
 
diff --git a/mk/stageN.mk b/mk/stageN.mk
index 73eae557803..eda991722dc 100644
--- a/mk/stageN.mk
+++ b/mk/stageN.mk
@@ -96,10 +96,6 @@ stage$(2)/lib/$$(CFG_LIBRUSTC): $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
 
 endef
 
-# Instantiate template for building initial stdlib
-SREQpre = stage0/lib/main.o $(MKFILES)
-$(eval $(call STDLIBGEN,pre,0))
-
 # Instantiate template for 0->1, 1->2, 2->3 build dirs
 
 $(eval $(call STAGEN,0,1))