Skip to content

Commit f54d358

Browse files
graydongraydon
committed
---
yaml --- r: 3347 b: refs/heads/master c: 79ba315 h: refs/heads/master i: 3345: 3657119 3343: 8dd8077 v: v3
1 parent 868eb99 commit f54d358

File tree

8 files changed

+124
-86
lines changed

8 files changed

+124
-86
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: afa632124f149b190ff3fb0a625a6a162637d82c
2+
refs/heads/master: 79ba31504b7ffdef6b44d24a6a38ba37040caca3

‎trunk/Makefile.in

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ CFG_STDLIB :=$(call CFG_LIB_NAME,std)
5050

5151
# version-string calculation
5252
CFG_GIT_DIR := $(CFG_SRC_DIR).git
53-
CFG_VERSION := prerelease
53+
CFG_VERSION = prerelease
5454
ifneq ($(wildcard $(CFG_GIT)),)
5555
ifneq ($(wildcard $(CFG_GIT_DIR)),)
5656
CFG_VERSION += $(shell git --git-dir=$(CFG_GIT_DIR) log -1 \
@@ -233,7 +233,7 @@ config.mk: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
233233

234234

235235
######################################################################
236-
# Additional makefiles
236+
# Primary-target makefiles
237237
######################################################################
238238

239239
include $(CFG_SRC_DIR)/mk/intrinsics.mk
@@ -243,11 +243,38 @@ include $(CFG_SRC_DIR)/mk/stage2.mk
243243
include $(CFG_SRC_DIR)/mk/stage3.mk
244244
include $(CFG_SRC_DIR)/mk/rt.mk
245245
include $(CFG_SRC_DIR)/mk/rustllvm.mk
246-
include $(CFG_SRC_DIR)/mk/docs.mk
247-
include $(CFG_SRC_DIR)/mk/tests.mk
248-
include $(CFG_SRC_DIR)/mk/dist.mk
249-
include $(CFG_SRC_DIR)/mk/snap.mk
250-
include $(CFG_SRC_DIR)/mk/clean.mk
251246
include $(CFG_SRC_DIR)/mk/autodep.mk
252247
include $(CFG_SRC_DIR)/mk/fuzzer.mk
253-
include $(CFG_SRC_DIR)/mk/pp.mk
248+
include $(CFG_SRC_DIR)/mk/docs.mk
249+
250+
251+
######################################################################
252+
# Secondary makefiles, conditionalized for speed
253+
######################################################################
254+
255+
ifneq ($(findstring dist,$(MAKECMDGOALS)),)
256+
include $(CFG_SRC_DIR)/mk/dist.mk
257+
endif
258+
259+
ifneq ($(findstring snap,$(MAKECMDGOALS)),)
260+
include $(CFG_SRC_DIR)/mk/snap.mk
261+
endif
262+
263+
ifneq ($(findstring reformat,$(MAKECMDGOALS)),)
264+
include $(CFG_SRC_DIR)/mk/pp.mk
265+
endif
266+
267+
ifneq ($(findstring check,$(MAKECMDGOALS)),)
268+
include $(CFG_SRC_DIR)/mk/tests.mk
269+
else
270+
ifneq ($(findstring test,$(MAKECMDGOALS)),)
271+
include $(CFG_SRC_DIR)/mk/tests.mk
272+
endif
273+
endif
274+
275+
ifneq ($(findstring clean,$(MAKECMDGOALS)),)
276+
include $(CFG_SRC_DIR)/mk/dist.mk
277+
include $(CFG_SRC_DIR)/mk/snap.mk
278+
include $(CFG_SRC_DIR)/mk/tests.mk
279+
include $(CFG_SRC_DIR)/mk/clean.mk
280+
endif

‎trunk/mk/clean.mk

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@
44

55
.PHONY: clean
66

7-
tidy:
8-
@$(call E, check: formatting)
9-
$(Q)echo \
10-
$(filter-out $(GENERATED) $(addprefix $(S)src/, $(GENERATED)) \
11-
$(addprefix $(S)src/, $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \
12-
$(RUSTLLVM_HDR) $(PKG_3RDPARTY)) \
13-
$(S)src/etc/%, $(PKG_FILES)) \
14-
| xargs -n 10 python $(S)src/etc/tidy.py
15-
167
clean:
178
@$(call E, cleaning)
189
$(Q)rm -f $(RUNTIME_OBJS) $(RUNTIME_DEF)

‎trunk/mk/docs.mk

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
######################################################################
44

55
doc/version.texi: $(MKFILES) rust.texi
6-
echo "@macro gitversion" >$@
7-
echo "$(CFG_VERSION)" >>$@
8-
echo "@end macro" >>$@
6+
@$(call E, version-stamp: $@)
7+
$(Q)echo "@macro gitversion" >$@
8+
$(Q)echo "$(CFG_VERSION)" >>$@
9+
$(Q)echo "@end macro" >>$@
910

1011
doc/%.pdf: %.texi doc/version.texi
11-
texi2pdf --batch -I doc -o $@ --clean $<
12+
@$(call E, texi2pdf: $@)
13+
$(Q)texi2pdf --batch -I doc -o $@ --clean $<
1214

1315
doc/%.html: %.texi doc/version.texi
14-
makeinfo -I doc --html --ifhtml --force --no-split --output=$@ $<
16+
@$(call E, makeinfo: $@)
17+
$(Q)makeinfo -I doc --html --ifhtml --force --no-split --output=$@ $<
1518

1619
docsnap: doc/rust.pdf
17-
mv $< doc/rust-$(shell date +"%Y-%m-%d")-snap.pdf
20+
@$(call E, snap: doc/rust-$(shell date +"%Y-%m-%d")-snap.pdf)
21+
$(Q)mv $< doc/rust-$(shell date +"%Y-%m-%d")-snap.pdf

‎trunk/mk/pp.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

2-
PP_INPUTS := $(wildcard $(addprefix $(S)src/lib/,*.rs */*.rs)) \
3-
$(wildcard $(addprefix $(S)src/comp/,*.rs */*.rs */*/*.rs)) \
4-
$(wildcard $(S)src/test/*/*.rs \
5-
$(S)src/test/*/*/*.rs)
2+
PP_INPUTS = $(wildcard $(addprefix $(S)src/lib/,*.rs */*.rs)) \
3+
$(wildcard $(addprefix $(S)src/comp/,*.rs */*.rs */*/*.rs)) \
4+
$(wildcard $(S)src/test/*/*.rs \
5+
$(S)src/test/*/*/*.rs)
66

77
PP_INPUTS_FILTERED = $(shell echo $(PP_INPUTS) | xargs grep -L no-reformat)
88

‎trunk/mk/rt.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,12 @@ rt/%.o: rt/%.s $(MKFILES)
8181

8282
ifdef CFG_WINDOWSY
8383
rt/main.ll: rt/main.ll.in
84-
sed 's/MAIN/WinMain@16/' < $^ > $@
84+
@$(call E, sed: $@)
85+
$(Q)sed 's/MAIN/WinMain@16/' < $^ > $@
8586
else
8687
rt/main.ll: rt/main.ll.in
87-
sed 's/MAIN/main/' < $^ > $@
88+
@$(call E, sed: $@)
89+
$(Q)sed 's/MAIN/main/' < $^ > $@
8890
endif
8991

9092
rt/%.o: rt/%.ll $(MKFILES)

‎trunk/mk/rustllvm.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ RUSTLLVM_OBJS_OBJS := $(RUSTLLVM_OBJS_CS:.cpp=.o)
2020
# versions of LLVM. In newer versions some of the bits of this library are
2121
# already in LLVM itself, so they are skipped.
2222
rustllvm/rustllvmbits.a: $(RUSTLLVM_LIB_OBJS)
23-
rm -f $@
24-
ar crs $@ $^
23+
@$(call E, archive: $@)
24+
$(Q)rm -f $@
25+
$(Q)ar crs $@ $^
2526

2627
# Note: We pass $(CFG_LLVM_LIBS) twice to fix the windows link since
2728
# it has no -whole-archive.

‎trunk/mk/tests.mk

Lines changed: 67 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ ALL_TEST_INPUTS = $(wildcard $(S)src/test/*/*.rs \
66
$(S)src/test/*/*/*.rs \
77
$(S)src/test/*/*.rc)
88

9-
TEST_XFAILS_STAGE0 = $(shell grep -l xfail-stage0 $(ALL_TEST_INPUTS))
10-
TEST_XFAILS_STAGE1 = $(shell grep -l xfail-stage1 $(ALL_TEST_INPUTS))
11-
TEST_XFAILS_STAGE2 = $(shell grep -l xfail-stage2 $(ALL_TEST_INPUTS))
9+
ifneq ($(findstring check,$(MAKECMDGOALS)),)
10+
XFAIL_INPUTS := $(shell grep -l xfail $(ALL_TEST_INPUTS))
11+
TEST_XFAILS_STAGE0 := $(shell grep -l xfail-stage0 $(XFAIL_INPUTS))
12+
TEST_XFAILS_STAGE1 := $(shell grep -l xfail-stage1 $(XFAIL_INPUTS))
13+
TEST_XFAILS_STAGE2 := $(shell grep -l xfail-stage2 $(XFAIL_INPUTS))
1214

1315
ifdef MINGW_CROSS
1416
TEST_XFAILS_STAGE0 += $(S)src/test/run-pass/native-mod.rc
@@ -20,101 +22,103 @@ TEST_XFAILS_STAGE0 += $(S)src/test/run-pass/native-mod.rc
2022
TEST_XFAILS_STAGE1 += $(S)src/test/run-pass/native-mod.rc
2123
TEST_XFAILS_STAGE2 += $(S)src/test/run-pass/native-mod.rc
2224
endif
25+
endif
26+
2327

24-
BENCH_RS = $(wildcard $(S)src/test/bench/shootout/*.rs) \
28+
BENCH_RS := $(wildcard $(S)src/test/bench/shootout/*.rs) \
2529
$(wildcard $(S)src/test/bench/99-bottles/*.rs)
26-
RPASS_RC = $(wildcard $(S)src/test/run-pass/*.rc)
27-
RPASS_RS = $(wildcard $(S)src/test/run-pass/*.rs) $(BENCH_RS)
28-
RFAIL_RC = $(wildcard $(S)src/test/run-fail/*.rc)
29-
RFAIL_RS = $(wildcard $(S)src/test/run-fail/*.rs)
30-
CFAIL_RC = $(wildcard $(S)src/test/compile-fail/*.rc)
31-
CFAIL_RS = $(wildcard $(S)src/test/compile-fail/*.rs)
30+
RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
31+
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs) $(BENCH_RS)
32+
RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
33+
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
34+
CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
35+
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
3236

3337
ifdef CHECK_XFAILS
34-
TEST_RPASS_CRATES_STAGE0 = $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RC))
35-
TEST_RPASS_CRATES_STAGE1 = $(filter $(TEST_XFAILS_STAGE1), $(RPASS_RC))
36-
TEST_RPASS_CRATES_STAGE2 = $(filter $(TEST_XFAILS_STAGE2), $(RPASS_RC))
37-
TEST_RPASS_SOURCES_STAGE0 = $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RS))
38-
TEST_RPASS_SOURCES_STAGE1 = $(filter $(TEST_XFAILS_STAGE1), $(RPASS_RS))
39-
TEST_RPASS_SOURCES_STAGE2 = $(filter $(TEST_XFAILS_STAGE2), $(RPASS_RS))
38+
TEST_RPASS_CRATES_STAGE0 := $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RC))
39+
TEST_RPASS_CRATES_STAGE1 := $(filter $(TEST_XFAILS_STAGE1), $(RPASS_RC))
40+
TEST_RPASS_CRATES_STAGE2 := $(filter $(TEST_XFAILS_STAGE2), $(RPASS_RC))
41+
TEST_RPASS_SOURCES_STAGE0 := $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RS))
42+
TEST_RPASS_SOURCES_STAGE1 := $(filter $(TEST_XFAILS_STAGE1), $(RPASS_RS))
43+
TEST_RPASS_SOURCES_STAGE2 := $(filter $(TEST_XFAILS_STAGE2), $(RPASS_RS))
4044
else
41-
TEST_RPASS_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RC))
42-
TEST_RPASS_CRATES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(RPASS_RC))
43-
TEST_RPASS_CRATES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE2), $(RPASS_RC))
44-
TEST_RPASS_SOURCES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RS))
45-
TEST_RPASS_SOURCES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(RPASS_RS))
46-
TEST_RPASS_SOURCES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(RPASS_RS))
45+
TEST_RPASS_CRATES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RC))
46+
TEST_RPASS_CRATES_STAGE1 := $(filter-out $(TEST_XFAILS_STAGE1), $(RPASS_RC))
47+
TEST_RPASS_CRATES_STAGE1 := $(filter-out $(TEST_XFAILS_STAGE2), $(RPASS_RC))
48+
TEST_RPASS_SOURCES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RS))
49+
TEST_RPASS_SOURCES_STAGE1 := $(filter-out $(TEST_XFAILS_STAGE1), $(RPASS_RS))
50+
TEST_RPASS_SOURCES_STAGE2 := $(filter-out $(TEST_XFAILS_STAGE2), $(RPASS_RS))
4751
endif
4852

49-
TEST_RPASS_EXES_STAGE0 = \
53+
TEST_RPASS_EXES_STAGE0 := \
5054
$(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE0:.rc=.stage0$(X))) \
5155
$(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE0:.rs=.stage0$(X)))
52-
TEST_RPASS_EXES_STAGE1 = \
56+
TEST_RPASS_EXES_STAGE1 := \
5357
$(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE1:.rc=.stage1$(X))) \
5458
$(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE1:.rs=.stage1$(X)))
55-
TEST_RPASS_EXES_STAGE2 = \
59+
TEST_RPASS_EXES_STAGE2 := \
5660
$(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE1:.rc=.stage2$(X))) \
5761
$(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE1:.rs=.stage2$(X)))
5862

59-
TEST_RPASS_OUTS_STAGE0 = \
63+
TEST_RPASS_OUTS_STAGE0 := \
6064
$(TEST_RPASS_EXES_STAGE0:.stage0$(X)=.stage0.out)
61-
TEST_RPASS_OUTS_STAGE1 = \
65+
TEST_RPASS_OUTS_STAGE1 := \
6266
$(TEST_RPASS_EXES_STAGE1:.stage1$(X)=.stage1.out)
63-
TEST_RPASS_OUTS_STAGE2 = \
67+
TEST_RPASS_OUTS_STAGE2 := \
6468
$(TEST_RPASS_EXES_STAGE2:.stage2$(X)=.stage2.out)
6569

66-
TEST_RPASS_TMPS_STAGE0 = \
70+
TEST_RPASS_TMPS_STAGE0 := \
6771
$(TEST_RPASS_EXES_STAGE0:.stage0$(X)=.stage0$(X).tmp)
68-
TEST_RPASS_TMPS_STAGE1 = \
72+
TEST_RPASS_TMPS_STAGE1 := \
6973
$(TEST_RPASS_EXES_STAGE1:.stage1$(X)=.stage1$(X).tmp)
70-
TEST_RPASS_TMPS_STAGE2 = \
74+
TEST_RPASS_TMPS_STAGE2 := \
7175
$(TEST_RPASS_EXES_STAGE2:.stage2$(X)=.stage2$(X).tmp)
7276

7377

74-
TEST_RFAIL_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RC))
75-
TEST_RFAIL_CRATES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(RFAIL_RC))
76-
TEST_RFAIL_CRATES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(RFAIL_RC))
77-
TEST_RFAIL_SOURCES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RS))
78-
TEST_RFAIL_SOURCES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(RFAIL_RS))
79-
TEST_RFAIL_SOURCES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(RFAIL_RS))
78+
TEST_RFAIL_CRATES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RC))
79+
TEST_RFAIL_CRATES_STAGE1 := $(filter-out $(TEST_XFAILS_STAGE1), $(RFAIL_RC))
80+
TEST_RFAIL_CRATES_STAGE2 := $(filter-out $(TEST_XFAILS_STAGE2), $(RFAIL_RC))
81+
TEST_RFAIL_SOURCES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RS))
82+
TEST_RFAIL_SOURCES_STAGE1 := $(filter-out $(TEST_XFAILS_STAGE1), $(RFAIL_RS))
83+
TEST_RFAIL_SOURCES_STAGE2 := $(filter-out $(TEST_XFAILS_STAGE2), $(RFAIL_RS))
8084

81-
TEST_RFAIL_EXES_STAGE0 = \
85+
TEST_RFAIL_EXES_STAGE0 := \
8286
$(subst $(S)src/,,$(TEST_RFAIL_CRATES_STAGE0:.rc=.stage0$(X))) \
8387
$(subst $(S)src/,,$(TEST_RFAIL_SOURCES_STAGE0:.rs=.stage0$(X)))
84-
TEST_RFAIL_EXES_STAGE1 = \
88+
TEST_RFAIL_EXES_STAGE1 := \
8589
$(subst $(S)src/,,$(TEST_RFAIL_CRATES_STAGE1:.rc=.stage1$(X))) \
8690
$(subst $(S)src/,,$(TEST_RFAIL_SOURCES_STAGE1:.rs=.stage1$(X)))
87-
TEST_RFAIL_EXES_STAGE2 = \
91+
TEST_RFAIL_EXES_STAGE2 := \
8892
$(subst $(S)src/,,$(TEST_RFAIL_CRATES_STAGE2:.rc=.stage2$(X))) \
8993
$(subst $(S)src/,,$(TEST_RFAIL_SOURCES_STAGE2:.rs=.stage2$(X)))
9094

91-
TEST_RFAIL_OUTS_STAGE0 = \
95+
TEST_RFAIL_OUTS_STAGE0 := \
9296
$(TEST_RFAIL_EXES_STAGE0:.stage0$(X)=.stage0.out)
93-
TEST_RFAIL_OUTS_STAGE1 = \
97+
TEST_RFAIL_OUTS_STAGE1 := \
9498
$(TEST_RFAIL_EXES_STAGE1:.stage1$(X)=.stage1.out)
95-
TEST_RFAIL_OUTS_STAGE2 = \
99+
TEST_RFAIL_OUTS_STAGE2 := \
96100
$(TEST_RFAIL_EXES_STAGE2:.stage2$(X)=.stage2.out)
97101

98102

99-
TEST_CFAIL_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RC))
100-
TEST_CFAIL_CRATES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(CFAIL_RC))
101-
TEST_CFAIL_CRATES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(CFAIL_RC))
102-
TEST_CFAIL_SOURCES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RS))
103-
TEST_CFAIL_SOURCES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(CFAIL_RS))
104-
TEST_CFAIL_SOURCES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(CFAIL_RS))
103+
TEST_CFAIL_CRATES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RC))
104+
TEST_CFAIL_CRATES_STAGE1 := $(filter-out $(TEST_XFAILS_STAGE1), $(CFAIL_RC))
105+
TEST_CFAIL_CRATES_STAGE2 := $(filter-out $(TEST_XFAILS_STAGE2), $(CFAIL_RC))
106+
TEST_CFAIL_SOURCES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RS))
107+
TEST_CFAIL_SOURCES_STAGE1 := $(filter-out $(TEST_XFAILS_STAGE1), $(CFAIL_RS))
108+
TEST_CFAIL_SOURCES_STAGE2 := $(filter-out $(TEST_XFAILS_STAGE2), $(CFAIL_RS))
105109

106-
TEST_CFAIL_OUTS_STAGE0 = \
110+
TEST_CFAIL_OUTS_STAGE0 := \
107111
$(subst $(S)src/,,$(TEST_CFAIL_CRATES_STAGE0:.rc=.stage0.out)) \
108112
$(subst $(S)src/,,$(TEST_CFAIL_SOURCES_STAGE0:.rs=.stage0.out))
109-
TEST_CFAIL_OUTS_STAGE1 = \
113+
TEST_CFAIL_OUTS_STAGE1 := \
110114
$(subst $(S)src/,,$(TEST_CFAIL_CRATES_STAGE1:.rc=.stage1.out)) \
111115
$(subst $(S)src/,,$(TEST_CFAIL_SOURCES_STAGE1:.rs=.stage1.out))
112-
TEST_CFAIL_OUTS_STAGE2 = \
116+
TEST_CFAIL_OUTS_STAGE2 := \
113117
$(subst $(S)src/,,$(TEST_CFAIL_CRATES_STAGE2:.rc=.stage2.out)) \
114118
$(subst $(S)src/,,$(TEST_CFAIL_SOURCES_STAGE2:.rs=.stage2.out))
115119

116120

117-
ALL_TEST_CRATES = $(TEST_CFAIL_CRATES_STAGE0) \
121+
ALL_TEST_CRATES := $(TEST_CFAIL_CRATES_STAGE0) \
118122
$(TEST_RFAIL_CRATES_STAGE0) \
119123
$(TEST_RPASS_CRATES_STAGE0) \
120124
$(TEST_CFAIL_CRATES_STAGE1) \
@@ -124,7 +128,7 @@ ALL_TEST_CRATES = $(TEST_CFAIL_CRATES_STAGE0) \
124128
$(TEST_RFAIL_CRATES_STAGE2) \
125129
$(TEST_RPASS_CRATES_STAGE2)
126130

127-
ALL_TEST_SOURCES = $(TEST_CFAIL_SOURCES_STAGE0) \
131+
ALL_TEST_SOURCES := $(TEST_CFAIL_SOURCES_STAGE0) \
128132
$(TEST_RFAIL_SOURCES_STAGE0) \
129133
$(TEST_RPASS_SOURCES_STAGE0) \
130134
$(TEST_CFAIL_SOURCES_STAGE1) \
@@ -182,6 +186,15 @@ compile-check: tidy \
182186
# Testing rules
183187
######################################################################
184188

189+
tidy:
190+
@$(call E, check: formatting)
191+
$(Q)echo \
192+
$(filter-out $(GENERATED) $(addprefix $(S)src/, $(GENERATED)) \
193+
$(addprefix $(S)src/, $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \
194+
$(RUSTLLVM_HDR) $(PKG_3RDPARTY)) \
195+
$(S)src/etc/%, $(PKG_FILES)) \
196+
| xargs -n 10 python $(S)src/etc/tidy.py
197+
185198
%.stage0$(X): %.rs $(SREQ0)
186199
@$(call E, compile_and_link: $@)
187200
$(STAGE0) -o $@ $<

0 commit comments

Comments
 (0)