Instantiate the stage0/lib/stdlib rules from stage0.mk instead of stageN.mk.

Author: msullivan

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
+endif

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))
 

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))