Merge the stage1,2,3.mk files into a common definition in stageN.mk, more rearrangement of host/target libs.

Author: graydon

Makefile.in

@@ -108,19 +108,6 @@ X := $(CFG_EXE_SUFFIX)
 # Look in doc and src dirs.
 VPATH := $(S)doc $(S)src
 
-# Compilers we build, we now know how to run.
-STAGE0 := $(Q)$(call CFG_RUN_TARG,stage0,stage0,\
-                stage0/rustc$(X) $(CFG_RUSTC_FLAGS))
-STAGE1 := $(Q)$(call CFG_RUN_TARG,stage1,stage0, \
-                $(CFG_VALGRIND_COMPILE) stage1/rustc$(X) \
-                $(CFG_RUSTC_FLAGS))
-STAGE2 := $(Q)$(call CFG_RUN_TARG,stage2,stage1, \
-                $(CFG_VALGRIND_COMPILE) stage2/rustc$(X) \
-                $(CFG_RUSTC_FLAGS))
-STAGE3 := $(Q)$(call CFG_RUN_TARG,stage3,stage2, \
-                $(CFG_VALGRIND_COMPILE) stage3/rustc$(X) \
-                $(CFG_RUSTC_FLAGS))
-
 # "Source" files we generate in builddir along the way.
 GENERATED :=
 
@@ -147,19 +134,6 @@ COMPILER_CRATE := $(S)src/comp/rustc.rc
 COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
                                 rustc.rc *.rs */*.rs */*/*.rs))
 
-######################################################################
-# Main target dependency variables
-######################################################################
-
-LREQ := rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM)
-SREQ0 := stage0/rustc$(X) $(LREQ) rt/main.o stage0/lib/glue.o \
-         stage0/lib/$(CFG_STDLIB)
-SREQ1 := stage1/rustc$(X) $(LREQ) rt/main.o stage1/lib/glue.o \
-         stage1/lib/$(CFG_STDLIB)
-SREQ2 := stage2/rustc$(X) $(LREQ) rt/main.o stage2/lib/glue.o \
-         stage2/lib/$(CFG_STDLIB)
-
-
 ######################################################################
 # Exports for sub-utilities
 ######################################################################
@@ -178,7 +152,32 @@ LLVM_AS := $(CFG_LLVM_BINDIR)/llvm-as$(X)
 LLC := $(CFG_LLVM_BINDIR)/llc$(X)
 
 ######################################################################
-# Single-target rules
+# Per-stage targets and runner
+######################################################################
+
+define SREQ
+SREQ$(1) = stage$(1)/rustc$(X)          \
+           stage$(1)/$$(CFG_RUNTIME)     \
+           stage$(1)/$$(CFG_STDLIB)      \
+           stage$(1)/$$(CFG_RUSTLLVM)    \
+           stage$(1)/lib/glue.o          \
+           stage$(1)/lib/main.o          \
+           stage$(1)/lib/$$(CFG_RUNTIME) \
+           stage$(1)/lib/$$(CFG_STDLIB)  \
+           $$(MKFILES)
+
+STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,stage$(1),stage$(1), \
+                $$(CFG_VALGRIND_COMPILE) stage$(1)/rustc$$(X) \
+                $$(CFG_RUSTC_FLAGS))
+endef
+
+$(eval $(call SREQ,0))
+$(eval $(call SREQ,1))
+$(eval $(call SREQ,2))
+$(eval $(call SREQ,3))
+
+######################################################################
+# Entrypoint rule
 ######################################################################
 
 ifneq ($(CFG_IN_TRANSITION),)
@@ -188,40 +187,9 @@ CFG_INFO := $(info cfg: *** compiler is in snapshot transition ***)
 CFG_INFO := $(info cfg: *** stage2 and later will not be built ***)
 CFG_INFO := $(info cfg:)
 
-all: rt/$(CFG_RUNTIME)          \
-     rustllvm/$(CFG_RUSTLLVM)   \
-     stage0/lib/$(CFG_STDLIB)   \
-     stage0/intrinsics.bc       \
-     stage0/rustc$(X)           \
-     $(GENERATED)               \
-     $(DOCS)                    \
-     stage1/lib/$(CFG_STDLIB)   \
-     stage1/intrinsics.bc       \
-     stage1/lib/glue.o          \
-     stage1/rustc$(X)           \
-
+all: $(SREQ0) $(SREQ1) $(GENERATED) $(DOCS)
 else
-
-all: rt/$(CFG_RUNTIME)          \
-     rustllvm/$(CFG_RUSTLLVM)   \
-     stage0/lib/$(CFG_STDLIB)   \
-     stage0/intrinsics.bc       \
-     stage0/rustc$(X)           \
-     $(GENERATED)               \
-     $(DOCS)                    \
-     stage1/lib/$(CFG_STDLIB)   \
-     stage1/intrinsics.bc       \
-     stage1/lib/glue.o          \
-     stage1/rustc$(X)           \
-     stage2/lib/$(CFG_STDLIB)   \
-     stage2/intrinsics.bc       \
-     stage2/lib/glue.o          \
-     stage2/rustc$(X)           \
-     stage3/lib/$(CFG_STDLIB)   \
-     stage3/lib/glue.o          \
-     stage3/intrinsics.bc       \
-     stage3/rustc$(X)
-
+all: $(SREQ0) $(SREQ1) $(SREQ2) $(SREQ3) $(GENERATED) $(DOCS)
 endif
 
 
@@ -240,9 +208,7 @@ 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/stage1.mk
-include $(CFG_SRC_DIR)/mk/stage2.mk
-include $(CFG_SRC_DIR)/mk/stage3.mk
+include $(CFG_SRC_DIR)/mk/stageN.mk
 include $(CFG_SRC_DIR)/mk/rt.mk
 include $(CFG_SRC_DIR)/mk/rustllvm.mk
 include $(CFG_SRC_DIR)/mk/autodep.mk

mk/stage0.mk

@@ -3,19 +3,33 @@ stage0/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES)
 	$(Q)$(S)src/etc/get-snapshot.py
 	$(Q)touch $@
 
-# These two will be made in the process of making rustc above.
+# Host libs will be made in the process of making rustc above.
 
-stage0/lib/glue.o: stage0/rustc$(X)
-	$(Q)touch $@
+# FIXME: temporary hack: the first two are currently carried in
+# lib/ directory only, so we copy them out.
 
-stage0/lib/$(CFG_STDLIB): stage0/rustc$(X)
-	$(Q)touch $@
+stage0/$(CFG_RUNTIME): stage0/lib/$(CFG_RUNTIME)
+	$(Q)cp $< $@
 
-stage0/intrinsics.bc: stage0/rustc$(X)
-	$(Q)touch $@
+stage0/$(CFG_STDLIB): stage0/lib/$(CFG_STDLIB)
+	$(Q)cp $< $@
 
 stage0/$(CFG_RUSTLLVM): stage0/rustc$(X)
 	$(Q)touch $@
 
+# Target libs will be made in the process of making rustc above.
+
+stage0/lib/glue.o: stage0/rustc$(X)
+	$(Q)touch $@
+
+# FIXME: temporary hack: currently not distributing main.o like we should;
+# copying from rt
+
+stage0/lib/main.o: rt/main.o
+	$(Q)cp $< $@
+
 stage0/lib/$(CFG_RUNTIME): stage0/rustc$(X)
 	$(Q)touch $@
+
+stage0/lib/$(CFG_STDLIB): stage0/rustc$(X)
+	$(Q)touch $@