auto merge of rust-lang#12310 : brson/rust/mkfilecleanup, r=sfackler

Two small fixes
brendanzab · Feb 16, 2014 · 6fe775e · 6fe775e
2 parents b36340b + 58678dc
commit 6fe775e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/mk/main.mk b/mk/main.mk
@@ -45,7 +45,7 @@ CFG_VERSION_WIN = $(subst -pre,,$(CFG_RELEASE))
 # and include all of the .d files in one fell swoop.
 ALL_OBJ_FILES :=
 
-ifneq ($(NO_MAKEFILE_DEPS),)
+ifneq ($(NO_MKFILE_DEPS),)
 MKFILE_DEPS :=
 else
 MKFILE_DEPS := config.stamp $(call rwildcard,$(CFG_SRC_DIR)mk/,*)

diff --git a/mk/tests.mk b/mk/tests.mk
@@ -174,16 +174,6 @@ endif
 check: cleantestlibs cleantmptestlogs tidy all check-stage2
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
-check-notidy: cleantestlibs cleantmptestlogs all check-stage2
-	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
-
-check-full: cleantestlibs cleantmptestlogs tidy \
-            all check-stage1 check-stage2 check-stage3
-	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
-
-check-test: cleantestlibs cleantmptestlogs all check-stage2-rfail
-	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
-
 check-lite: cleantestlibs cleantmptestlogs \
 	$(foreach crate,$(TARGET_CRATES),check-stage2-$(crate)) \
 	check-stage2-rpass \