diff options
| author | bors <bors@rust-lang.org> | 2014-02-16 00:51:33 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-16 00:51:33 -0800 |
| commit | 6fe775e2b5eaa77dd49c1d9a234c67d52e5f9087 (patch) | |
| tree | d0b85a4910f448505ffd092d55a3325366977be7 | |
| parent | b36340b6269e1b54fb4aa3ff49a90262fb2d953c (diff) | |
| parent | 58678dc229a8e2db141314a17e7bc0ea09b8a08a (diff) | |
| download | rust-6fe775e2b5eaa77dd49c1d9a234c67d52e5f9087.tar.gz rust-6fe775e2b5eaa77dd49c1d9a234c67d52e5f9087.zip | |
auto merge of #12310 : brson/rust/mkfilecleanup, r=sfackler
Two small fixes
| -rw-r--r-- | mk/main.mk | 2 | ||||
| -rw-r--r-- | mk/tests.mk | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/mk/main.mk b/mk/main.mk index aa5ae77b3ac..53ba07e65cb 100644 --- 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 index 8ca4da85994..e1c4a4ccf94 100644 --- 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 \ |