OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Sullivan 2011-07-21 11:58:01 -07:00 committed by Brian Anderson
parent d9286c8bdd
commit b01ecb10c3
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -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/intrinsics.mk
include $(CFG_SRC_DIR)/mk/stage0.mk
include $(CFG_SRC_DIR)/mk/stageN.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/rt.mk
include $(CFG_SRC_DIR)/mk/rustllvm.mk include $(CFG_SRC_DIR)/mk/rustllvm.mk
include $(CFG_SRC_DIR)/mk/autodep.mk include $(CFG_SRC_DIR)/mk/autodep.mk
@ -269,4 +269,4 @@ endif
ifneq ($(findstring clean,$(MAKECMDGOALS)),) ifneq ($(findstring clean,$(MAKECMDGOALS)),)
CFG_INFO := $(info cfg: including clean rules) CFG_INFO := $(info cfg: including clean rules)
include $(CFG_SRC_DIR)/mk/clean.mk include $(CFG_SRC_DIR)/mk/clean.mk
endif endif

6
mk/stage0.mk
View File

@ -35,6 +35,8 @@ stage0/lib/main.o: rt/main.o
stage0/lib/$(CFG_RUNTIME): stage0/rustc$(X) stage0/lib/$(CFG_RUNTIME): stage0/rustc$(X)
$(Q)touch $@ $(Q)touch $@
# stage0/lib/$(CFG_STDLIB) and stage0/lib/libstd.rlib rules are generated # Instantiate template (in stageN.mk) for building
# in stageN.mk # stage0/lib/$(CFG_STDLIB) and stage0/lib/libstd.rlib.
SREQpre = stage0/lib/main.o $(MKFILES)
$(eval $(call STDLIBGEN,pre,0))

4
mk/stageN.mk
View File

@ -96,10 +96,6 @@ stage$(2)/lib/$$(CFG_LIBRUSTC): $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
endef 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 # Instantiate template for 0->1, 1->2, 2->3 build dirs
$(eval $(call STAGEN,0,1)) $(eval $(call STAGEN,0,1))