diff options
| -rw-r--r-- | Makefile.in | 16 | ||||
| -rw-r--r-- | mk/autodep.mk | 54 | ||||
| -rw-r--r-- | mk/clean.mk | 9 | ||||
| -rw-r--r-- | mk/dist.mk | 4 | ||||
| -rw-r--r-- | mk/stage0.mk | 5 | ||||
| -rw-r--r-- | mk/tests.mk | 96 |
6 files changed, 44 insertions, 140 deletions
diff --git a/Makefile.in b/Makefile.in index 4edfc738..676b4cfb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -11,8 +11,6 @@ endif CFG_INFO := $(info cfg: building on $(CFG_OSTYPE) $(CFG_CPUTYPE)) -CFG_BOOT_FLAGS := $(BOOT_FLAGS) - ifdef CFG_DISABLE_OPTIMIZE $(info cfg: disabling rustc optimization (CFG_DISABLE_OPTIMIZE)) CFG_RUSTC_FLAGS := @@ -128,7 +126,6 @@ COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \ ###################################################################### LREQ := rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM) -BREQ := boot/rustboot$(X) stage0/$(CFG_STDLIB) SREQ0 := stage0/rustc$(X) $(LREQ) stage1/glue.o stage1/$(CFG_STDLIB) SREQ1 := stage1/rustc$(X) $(LREQ) stage2/glue.o stage2/$(CFG_STDLIB) SREQ2 := stage2/rustc$(X) $(LREQ) stage3/glue.o stage3/$(CFG_STDLIB) @@ -145,8 +142,7 @@ export CFG_SRC_DIR # Single-target rules ###################################################################### -all: boot/rustboot$(X) \ - rt/$(CFG_RUNTIME) \ +all: rt/$(CFG_RUNTIME) \ rustllvm/$(CFG_RUSTLLVM) \ stage0/$(CFG_STDLIB) \ stage0/rustc$(X) \ @@ -157,10 +153,10 @@ all: boot/rustboot$(X) \ stage1/rustc$(X) \ stage2/$(CFG_STDLIB) \ stage2/glue.o \ - stage2/rustc$(X) -# stage3/$(CFG_STDLIB) \ -# stage3/glue.o \ -# stage3/rustc$(X) \ + stage2/rustc$(X) \ + stage3/$(CFG_STDLIB) \ + stage3/glue.o \ + stage3/rustc$(X) ###################################################################### @@ -176,10 +172,10 @@ config.mk: $(S)configure $(S)Makefile.in # Additional makefiles ###################################################################### -include $(CFG_SRC_DIR)/mk/boot.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/rt.mk include $(CFG_SRC_DIR)/mk/rustllvm.mk include $(CFG_SRC_DIR)/mk/docs.mk diff --git a/mk/autodep.mk b/mk/autodep.mk index b2a785db..1eacbac1 100644 --- a/mk/autodep.mk +++ b/mk/autodep.mk @@ -2,7 +2,6 @@ # Auto-dependency ###################################################################### -ML_DEPFILES := $(BOOT_MLS:%.ml=%.d) C_DEPFILES := $(RUNTIME_CS:%.cpp=%.d) $(RUSTLLVM_LIB_CS:%.cpp=%.d) \ $(RUSTLLVM_OBJS_CS:%.cpp=%.d) @@ -24,57 +23,8 @@ rustllvm/%.d: rustllvm/%.cpp $(MKFILES) $(Q)rm -f [email protected] $(Q)mv [email protected] $@ -%.d: %.ml $(MKFILES) - @$(call E, dep: $@) - $(Q)ocamldep$(OPT) -slash $(BOOT_ML_DEP_INCS) $< >[email protected] - $(Q)$(CFG_PATH_MUNGE) [email protected] - $(Q)rm -f [email protected] - $(Q)perl -i.bak -pe "s@$(S)src/@@go" [email protected] - $(Q)rm -f [email protected] - $(Q)mv [email protected] $@ - -%.d: %.mli $(MKFILES) - @$(call E, dep: $@) - $(Q)ocamldep$(OPT) -slash $(BOOT_ML_DEP_INCS) $< >[email protected] - $(Q)$(CFG_PATH_MUNGE) [email protected] - $(Q)rm -f [email protected] - $(Q)perl -i.bak -pe "s@$(S)src/@@go" [email protected] - $(Q)rm -f [email protected] - $(Q)mv [email protected] $@ - ifneq ($(MAKECMDGOALS),clean) --include $(ML_DEPFILES) $(C_DEPFILES) -endif - -RUSTBOOT_PROBE := $(wildcard boot/rustboot$(X)) - -ifneq ($(RUSTBOOT_PROBE),) -CFG_INFO := $(info cfg: using built boot/rustboot$(X) for rust deps) -CRATE_DEPFILES := $(subst $(S)src/,,$(ALL_TEST_CRATES:%.rc=%.d)) \ - boot/$(CFG_STDLIB).d \ - stage0/rustc$(X).d \ - stage0/$(CFG_STDLIB).d - -boot/$(CFG_STDLIB).d: $(STDLIB_CRATE) $(STDLIB_INPUTS) \ - $(MKFILES) boot/rustboot$(X) - @$(call E, dep: $@) - $(BOOT) -o $(patsubst %.d,%$(X),$@) -shared -rdeps $< >[email protected] - $(Q)$(CFG_PATH_MUNGE) [email protected] - $(Q)rm -f [email protected] - $(Q)mv [email protected] $@ - -stage0/rustc$(X).d: $(COMPILER_CRATE) $(COMPILER_INPUTS) \ - $(STDLIB_CRATE) $(MKFILES) boot/rustboot$(X) - @$(call E, dep: $@) - $(Q)touch $@ - -%.d: %.rc $(MKFILES) - @$(call E, dep: $@) - $(Q)touch $@ - -ifneq ($(MAKECMDGOALS),clean) --include $(CRATE_DEPFILES) -endif +-include $(C_DEPFILES) endif -depend: boot/rustboot$(X) $(CRATE_DEPFILES) $(ML_DEPFILES) $(C_DEPFILES) +depend: $(C_DEPFILES) diff --git a/mk/clean.mk b/mk/clean.mk index 3055b614..938bc79e 100644 --- a/mk/clean.mk +++ b/mk/clean.mk @@ -23,7 +23,6 @@ clean: $(Q)rm -f $(C_DEPFILES:%.d=%.d.tmp) $(Q)rm -f $(CRATE_DEPFILES:%.d=%.d.tmp) $(Q)rm -f $(GENERATED) - $(Q)rm -f boot/rustboot$(X) boot/$(CFG_STDLIB) $(Q)rm -f stage0/rustc$(X) stage0/$(CFG_STDLIB) $(Q)rm -f stage1/rustc$(X) stage1/$(CFG_STDLIB) stage1/glue* $(Q)rm -f stage2/rustc$(X) stage2/$(CFG_STDLIB) stage2/glue* @@ -31,12 +30,10 @@ clean: $(Q)rm -f rustllvm/$(CFG_RUSTLLVM) rustllvm/rustllvmbits.a $(Q)rm -f rt/$(CFG_RUNTIME) $(Q)rm -Rf $(PKG_NAME)-*.tar.gz dist - $(Q)rm -f $(foreach ext,cmx cmi cmo cma bc o a d exe,\ - $(wildcard boot/*/*.$(ext) boot/*/*/*.$(ext))) $(Q)rm -f $(foreach ext,o a d bc s exe,$(wildcard stage*/*.$(ext))) - $(Q)rm -Rf $(foreach ext,out out.tmp \ - boot$(X) stage0$(X) stage1$(X) stage2$(X) \ - bc o s exe dSYM, \ + $(Q)rm -Rf $(foreach ext,out out.tmp \ + stage0$(X) stage1$(X) stage2$(X) \ + bc o s exe dSYM, \ $(wildcard test/*/*.$(ext) test/bench/*/*.$(ext))) $(Q)rm -Rf $(foreach ext, \ aux cp fn ky log pdf html pg toc tp vr cps, \ @@ -18,14 +18,12 @@ PKG_FILES = \ $(S)LICENSE.txt $(S)README \ $(S)configure $(S)Makefile.in \ $(addprefix $(S)src/, \ - README boot/README comp/README \ - $(filter-out $(GENERATED), $(BOOT_MLS)) \ + README comp/README \ $(RUNTIME_CS) $(RUNTIME_HDR) \ $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \ $(RUSTLLVM_HDR) \ $(PKG_3RDPARTY)) \ $(GENERATED) \ - $(S)src/boot/fe/lexer.ml \ $(COMPILER_INPUTS) \ $(STDLIB_INPUTS) \ $(ALL_TEST_INPUTS) \ diff --git a/mk/stage0.mk b/mk/stage0.mk index c41cddaf..493f9e00 100644 --- a/mk/stage0.mk +++ b/mk/stage0.mk @@ -1,9 +1,12 @@ stage0/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES) @$(call E, fetch: $@) - $(S)src/etc/get-snapshot.py + $(Q)$(S)src/etc/get-snapshot.py + $(Q)touch $@ # These two will be made in the process of making rustc above. stage0/glue.o: stage0/rustc$(X) + $(Q)touch $@ stage0/$(CFG_STDLIB): stage0/rustc$(X) + $(Q)touch $@ diff --git a/mk/tests.mk b/mk/tests.mk index 1314c6e5..c25715ab 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -6,19 +6,16 @@ ALL_TEST_INPUTS = $(wildcard $(S)src/test/*/*.rs \ $(S)src/test/*/*/*.rs \ $(S)src/test/*/*.rc) -TEST_XFAILS_BOOT = $(shell grep -l xfail-boot $(ALL_TEST_INPUTS)) TEST_XFAILS_STAGE0 = $(shell grep -l xfail-stage0 $(ALL_TEST_INPUTS)) TEST_XFAILS_STAGE1 = $(shell grep -l xfail-stage1 $(ALL_TEST_INPUTS)) TEST_XFAILS_STAGE2 = $(shell grep -l xfail-stage2 $(ALL_TEST_INPUTS)) ifdef MINGW_CROSS -TEST_XFAILS_BOOT += $(S)src/test/run-pass/native-mod.rc TEST_XFAILS_STAGE0 += $(S)src/test/run-pass/native-mod.rc TEST_XFAILS_STAGE1 += $(S)src/test/run-pass/native-mod.rc TEST_XFAILS_STAGE2 += $(S)src/test/run-pass/native-mod.rc endif ifdef CFG_WINDOWSY -TEST_XFAILS_BOOT += $(S)src/test/run-pass/native-mod.rc TEST_XFAILS_STAGE0 += $(S)src/test/run-pass/native-mod.rc TEST_XFAILS_STAGE1 += $(S)src/test/run-pass/native-mod.rc TEST_XFAILS_STAGE2 += $(S)src/test/run-pass/native-mod.rc @@ -34,28 +31,21 @@ CFAIL_RC = $(wildcard $(S)src/test/compile-fail/*.rc) CFAIL_RS = $(wildcard $(S)src/test/compile-fail/*.rs) ifdef CHECK_XFAILS -TEST_RPASS_CRATES_BOOT = $(filter $(TEST_XFAILS_BOOT), $(RPASS_RC)) TEST_RPASS_CRATES_STAGE0 = $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RC)) TEST_RPASS_CRATES_STAGE1 = $(filter $(TEST_XFAILS_STAGE1), $(RPASS_RC)) TEST_RPASS_CRATES_STAGE2 = $(filter $(TEST_XFAILS_STAGE2), $(RPASS_RC)) -TEST_RPASS_SOURCES_BOOT = $(filter $(TEST_XFAILS_BOOT), $(RPASS_RS)) TEST_RPASS_SOURCES_STAGE0 = $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RS)) TEST_RPASS_SOURCES_STAGE1 = $(filter $(TEST_XFAILS_STAGE1), $(RPASS_RS)) TEST_RPASS_SOURCES_STAGE2 = $(filter $(TEST_XFAILS_STAGE2), $(RPASS_RS)) else -TEST_RPASS_CRATES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(RPASS_RC)) TEST_RPASS_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RC)) TEST_RPASS_CRATES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(RPASS_RC)) TEST_RPASS_CRATES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE2), $(RPASS_RC)) -TEST_RPASS_SOURCES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(RPASS_RS)) TEST_RPASS_SOURCES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RS)) TEST_RPASS_SOURCES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(RPASS_RS)) TEST_RPASS_SOURCES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(RPASS_RS)) endif -TEST_RPASS_EXES_BOOT = \ - $(subst $(S)src/,,$(TEST_RPASS_CRATES_BOOT:.rc=.boot$(X))) \ - $(subst $(S)src/,,$(TEST_RPASS_SOURCES_BOOT:.rs=.boot$(X))) TEST_RPASS_EXES_STAGE0 = \ $(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE0:.rc=.stage0$(X))) \ $(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE0:.rs=.stage0$(X))) @@ -66,8 +56,6 @@ TEST_RPASS_EXES_STAGE2 = \ $(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE1:.rc=.stage2$(X))) \ $(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE1:.rs=.stage2$(X))) -TEST_RPASS_OUTS_BOOT = \ - $(TEST_RPASS_EXES_BOOT:.boot$(X)=.boot.out) TEST_RPASS_OUTS_STAGE0 = \ $(TEST_RPASS_EXES_STAGE0:.stage0$(X)=.stage0.out) TEST_RPASS_OUTS_STAGE1 = \ @@ -75,8 +63,6 @@ TEST_RPASS_OUTS_STAGE1 = \ TEST_RPASS_OUTS_STAGE2 = \ $(TEST_RPASS_EXES_STAGE2:.stage2$(X)=.stage2.out) -TEST_RPASS_TMPS_BOOT = \ - $(TEST_RPASS_EXES_BOOT:.boot$(X)=.boot$(X).tmp) TEST_RPASS_TMPS_STAGE0 = \ $(TEST_RPASS_EXES_STAGE0:.stage0$(X)=.stage0$(X).tmp) TEST_RPASS_TMPS_STAGE1 = \ @@ -85,18 +71,13 @@ TEST_RPASS_TMPS_STAGE2 = \ $(TEST_RPASS_EXES_STAGE2:.stage2$(X)=.stage2$(X).tmp) -TEST_RFAIL_CRATES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(RFAIL_RC)) TEST_RFAIL_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RC)) TEST_RFAIL_CRATES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(RFAIL_RC)) TEST_RFAIL_CRATES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(RFAIL_RC)) -TEST_RFAIL_SOURCES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(RFAIL_RS)) TEST_RFAIL_SOURCES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RS)) TEST_RFAIL_SOURCES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(RFAIL_RS)) TEST_RFAIL_SOURCES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(RFAIL_RS)) -TEST_RFAIL_EXES_BOOT = \ - $(subst $(S)src/,,$(TEST_RFAIL_CRATES_BOOT:.rc=.boot$(X))) \ - $(subst $(S)src/,,$(TEST_RFAIL_SOURCES_BOOT:.rs=.boot$(X))) TEST_RFAIL_EXES_STAGE0 = \ $(subst $(S)src/,,$(TEST_RFAIL_CRATES_STAGE0:.rc=.stage0$(X))) \ $(subst $(S)src/,,$(TEST_RFAIL_SOURCES_STAGE0:.rs=.stage0$(X))) @@ -107,8 +88,6 @@ TEST_RFAIL_EXES_STAGE2 = \ $(subst $(S)src/,,$(TEST_RFAIL_CRATES_STAGE2:.rc=.stage2$(X))) \ $(subst $(S)src/,,$(TEST_RFAIL_SOURCES_STAGE2:.rs=.stage2$(X))) -TEST_RFAIL_OUTS_BOOT = \ - $(TEST_RFAIL_EXES_BOOT:.boot$(X)=.boot.out) TEST_RFAIL_OUTS_STAGE0 = \ $(TEST_RFAIL_EXES_STAGE0:.stage0$(X)=.stage0.out) TEST_RFAIL_OUTS_STAGE1 = \ @@ -116,8 +95,6 @@ TEST_RFAIL_OUTS_STAGE1 = \ TEST_RFAIL_OUTS_STAGE2 = \ $(TEST_RFAIL_EXES_STAGE0:.stage2$(X)=.stage2.out) -TEST_RFAIL_TMPS_BOOT = \ - $(TEST_RFAIL_EXES_BOOT:.boot$(X)=.boot$(X).tmp) TEST_RFAIL_TMPS_STAGE0 = \ $(TEST_RFAIL_EXES_STAGE0:.stage0$(X)=.stage0$(X).tmp) TEST_RFAIL_TMPS_STAGE1 = \ @@ -125,18 +102,13 @@ TEST_RFAIL_TMPS_STAGE1 = \ TEST_RFAIL_TMPS_STAGE2 = \ $(TEST_RFAIL_EXES_STAGE2:.stage2$(X)=.stage2$(X).tmp) -TEST_CFAIL_CRATES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(CFAIL_RC)) TEST_CFAIL_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RC)) TEST_CFAIL_CRATES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(CFAIL_RC)) TEST_CFAIL_CRATES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(CFAIL_RC)) -TEST_CFAIL_SOURCES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(CFAIL_RS)) TEST_CFAIL_SOURCES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RS)) TEST_CFAIL_SOURCES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(CFAIL_RS)) TEST_CFAIL_SOURCES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(CFAIL_RS)) -TEST_CFAIL_EXES_BOOT = \ - $(subst $(S)src/,,$(TEST_CFAIL_CRATES_BOOT:.rc=.boot$(X))) \ - $(subst $(S)src/,,$(TEST_CFAIL_SOURCES_BOOT:.rs=.boot$(X))) TEST_CFAIL_EXES_STAGE0 = \ $(subst $(S)src/,,$(TEST_CFAIL_CRATES_STAGE0:.rc=.stage0$(X))) \ $(subst $(S)src/,,$(TEST_CFAIL_SOURCES_STAGE0:.rs=.stage0$(X))) @@ -147,8 +119,6 @@ TEST_CFAIL_EXES_STAGE2 = \ $(subst $(S)src/,,$(TEST_CFAIL_CRATES_STAGE2:.rc=.stage2$(X))) \ $(subst $(S)src/,,$(TEST_CFAIL_SOURCES_STAGE2:.rs=.stage2$(X))) -TEST_CFAIL_OUTS_BOOT = \ - $(TEST_CFAIL_EXES_BOOT:.boot$(X)=.boot.out) TEST_CFAIL_OUTS_STAGE0 = \ $(TEST_CFAIL_EXES_STAGE0:.stage0$(X)=.stage0.out) TEST_CFAIL_OUTS_STAGE1 = \ @@ -156,8 +126,6 @@ TEST_CFAIL_OUTS_STAGE1 = \ TEST_CFAIL_OUTS_STAGE2 = \ $(TEST_CFAIL_EXES_STAGE0:.stage2$(X)=.stage2.out) -TEST_CFAIL_TMPS_BOOT = \ - $(TEST_CFAIL_EXES_BOOT:.boot$(X)=.boot$(X).tmp) TEST_CFAIL_TMPS_STAGE0 = \ $(TEST_CFAIL_EXES_STAGE0:.stage0$(X)=.stage0$(X).tmp) TEST_CFAIL_TMPS_STAGE1 = \ @@ -166,10 +134,7 @@ TEST_CFAIL_TMPS_STAGE0 = \ $(TEST_CFAIL_EXES_STAGE2:.stage2$(X)=.stage2$(X).tmp) -ALL_TEST_CRATES = $(TEST_CFAIL_CRATES_BOOT) \ - $(TEST_RFAIL_CRATES_BOOT) \ - $(TEST_RPASS_CRATES_BOOT) \ - $(TEST_CFAIL_CRATES_STAGE0) \ +ALL_TEST_CRATES = $(TEST_CFAIL_CRATES_STAGE0) \ $(TEST_RFAIL_CRATES_STAGE0) \ $(TEST_RPASS_CRATES_STAGE0) \ $(TEST_CFAIL_CRATES_STAGE1) \ @@ -179,10 +144,7 @@ ALL_TEST_CRATES = $(TEST_CFAIL_CRATES_BOOT) \ $(TEST_RFAIL_CRATES_STAGE2) \ $(TEST_RPASS_CRATES_STAGE2) -ALL_TEST_SOURCES = $(TEST_CFAIL_SOURCES_BOOT) \ - $(TEST_RFAIL_SOURCES_BOOT) \ - $(TEST_RPASS_SOURCES_BOOT) \ - $(TEST_CFAIL_SOURCES_STAGE0) \ +ALL_TEST_SOURCES = $(TEST_CFAIL_SOURCES_STAGE0) \ $(TEST_RFAIL_SOURCES_STAGE0) \ $(TEST_RPASS_SOURCES_STAGE0) \ $(TEST_CFAIL_SOURCES_STAGE1) \ @@ -197,26 +159,23 @@ ALL_TEST_SOURCES = $(TEST_CFAIL_SOURCES_BOOT) \ unexport RUST_LOG -check_nocompile: $(TEST_CFAIL_OUTS_BOOT) \ - $(TEST_CFAIL_OUTS_STAGE0) +check_nocompile: $(TEST_CFAIL_OUTS_STAGE0) \ + $(TEST_CFAIL_OUTS_STAGE1) \ + $(TEST_CFAIL_OUTS_STAGE2) check: tidy \ - $(TEST_RPASS_EXES_BOOT) $(TEST_RFAIL_EXES_BOOT) \ - $(TEST_RPASS_OUTS_BOOT) $(TEST_RFAIL_OUTS_BOOT) \ - $(TEST_CFAIL_OUTS_BOOT) \ $(TEST_RPASS_EXES_STAGE0) $(TEST_RFAIL_EXES_STAGE0) \ $(TEST_RPASS_OUTS_STAGE0) $(TEST_RFAIL_OUTS_STAGE0) \ - $(TEST_CFAIL_OUTS_STAGE0) -# $(TEST_RPASS_EXES_STAGE1) $(TEST_RFAIL_EXES_STAGE1) \ -# $(TEST_RPASS_OUTS_STAGE1) $(TEST_RFAIL_OUTS_STAGE1) \ -# $(TEST_CFAIL_OUTS_STAGE1) \ -# $(TEST_RPASS_EXES_STAGE2) $(TEST_RFAIL_EXES_STAGE2) \ -# $(TEST_RPASS_OUTS_STAGE2) $(TEST_RFAIL_OUTS_STAGE2) \ -# $(TEST_CFAIL_OUTS_STAGE2) + $(TEST_CFAIL_OUTS_STAGE0) \ + $(TEST_RPASS_EXES_STAGE1) $(TEST_RFAIL_EXES_STAGE1) \ + $(TEST_RPASS_OUTS_STAGE1) $(TEST_RFAIL_OUTS_STAGE1) \ + $(TEST_CFAIL_OUTS_STAGE1) \ + $(TEST_RPASS_EXES_STAGE2) $(TEST_RFAIL_EXES_STAGE2) \ + $(TEST_RPASS_OUTS_STAGE2) $(TEST_RFAIL_OUTS_STAGE2) \ + $(TEST_CFAIL_OUTS_STAGE2) compile-check: tidy \ - $(TEST_RPASS_EXES_BOOT) $(TEST_RFAIL_EXES_BOOT) \ $(TEST_RPASS_EXES_STAGE0) $(TEST_RFAIL_EXES_STAGE0) \ $(TEST_RPASS_EXES_STAGE1) $(TEST_RFAIL_EXES_STAGE1) \ $(TEST_RPASS_EXES_STAGE2) $(TEST_RFAIL_EXES_STAGE2) @@ -254,15 +213,6 @@ compile-check: tidy \ -$(Q)$(CFG_DSYMUTIL) $@ - -%.boot$(X): %.rs $(BREQ) - @$(call E, compile [boot]: $@) - $(BOOT) -o $@ $< - -%.boot$(X): %.rc $(BREQ) - @$(call E, compile [boot]: $@) - $(BOOT) -o $@ $< - %.stage0.o: %.rc $(SREQ0) @$(call E, compile [stage0]: $@) $(STAGE0) -c -o $@ $< @@ -271,6 +221,7 @@ compile-check: tidy \ @$(call E, compile [stage0]: $@) $(STAGE0) -c -o $@ $< + %.stage1.o: %.rc $(SREQ1) @$(call E, compile [stage1]: $@) $(STAGE1) -c -o $@ $< @@ -279,6 +230,7 @@ compile-check: tidy \ @$(call E, compile [stage1]: $@) $(STAGE1) -c -o $@ $< + %.stage2.o: %.rc $(SREQ2) @$(call E, compile [stage2]: $@) $(STAGE2) -c -o $@ $< @@ -322,18 +274,26 @@ test/run-fail/%.out.tmp: test/run-fail/%$(X) \ "$$(grep error-pattern $(S)src/test/run-fail/$(basename $*).rs \ | cut -d : -f 2- | tr -d '\n\r')" $@ -test/compile-fail/%.boot.out.tmp: test/compile-fail/%.rs $(BREQ) - @$(call E, compile [boot]: $@) +test/compile-fail/%.stage0.out.tmp: test/compile-fail/%.rs $(SREQ0) + @$(call E, compile [stage0]: $@) $(Q)grep -q error-pattern $< $(Q)rm -f $@ - $(BOOT) -o $(@:.out=$(X)) $< >$@ 2>&1; test $$? -ne 0 + $(STAGE0) -o $(@:.out=$(X)) $< >$@ 2>&1; test $$? -ne 0 $(Q)grep --text --quiet \ "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@ -test/compile-fail/%.stage0.out.tmp: test/compile-fail/%.rs $(SREQ0) - @$(call E, compile [stage0]: $@) +test/compile-fail/%.stage1.out.tmp: test/compile-fail/%.rs $(SREQ1) + @$(call E, compile [stage1]: $@) $(Q)grep -q error-pattern $< $(Q)rm -f $@ - $(STAGE0) -o $(@:.out=$(X)) $< >$@ 2>&1; test $$? -ne 0 + $(STAGE1) -o $(@:.out=$(X)) $< >$@ 2>&1; test $$? -ne 0 + $(Q)grep --text --quiet \ + "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@ + +test/compile-fail/%.stage2.out.tmp: test/compile-fail/%.rs $(SREQ2) + @$(call E, compile [stage2]: $@) + $(Q)grep -q error-pattern $< + $(Q)rm -f $@ + $(STAGE2) -o $(@:.out=$(X)) $< >$@ 2>&1; test $$? -ne 0 $(Q)grep --text --quiet \ "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@ |