Skip to content

Commit 6fe775e

Browse files
committed
auto merge of #12310 : brson/rust/mkfilecleanup, r=sfackler
Two small fixes
2 parents b36340b + 58678dc commit 6fe775e

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

mk/main.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ CFG_VERSION_WIN = $(subst -pre,,$(CFG_RELEASE))
4545
# and include all of the .d files in one fell swoop.
4646
ALL_OBJ_FILES :=
4747

48-
ifneq ($(NO_MAKEFILE_DEPS),)
48+
ifneq ($(NO_MKFILE_DEPS),)
4949
MKFILE_DEPS :=
5050
else
5151
MKFILE_DEPS := config.stamp $(call rwildcard,$(CFG_SRC_DIR)mk/,*)

mk/tests.mk

-10
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,6 @@ endif
174174
check: cleantestlibs cleantmptestlogs tidy all check-stage2
175175
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
176176

177-
check-notidy: cleantestlibs cleantmptestlogs all check-stage2
178-
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
179-
180-
check-full: cleantestlibs cleantmptestlogs tidy \
181-
all check-stage1 check-stage2 check-stage3
182-
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
183-
184-
check-test: cleantestlibs cleantmptestlogs all check-stage2-rfail
185-
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
186-
187177
check-lite: cleantestlibs cleantmptestlogs \
188178
$(foreach crate,$(TARGET_CRATES),check-stage2-$(crate)) \
189179
check-stage2-rpass \

0 commit comments

Comments
 (0)