mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Two small fixes
This commit is contained in:
bors 2014-02-16 00:51:33 -08:00
commit 6fe775e2b5
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mk/main.mk
View file

@ -45,7 +45,7 @@ CFG_VERSION_WIN = $(subst -pre,,$(CFG_RELEASE))
# and include all of the .d files in one fell swoop. # and include all of the .d files in one fell swoop.
ALL_OBJ_FILES := ALL_OBJ_FILES :=
ifneq ($(NO_MAKEFILE_DEPS),) ifneq ($(NO_MKFILE_DEPS),)
MKFILE_DEPS := MKFILE_DEPS :=
else else
MKFILE_DEPS := config.stamp $(call rwildcard,$(CFG_SRC_DIR)mk/,*) MKFILE_DEPS := config.stamp $(call rwildcard,$(CFG_SRC_DIR)mk/,*)

10
mk/tests.mk
View file

@ -174,16 +174,6 @@ endif
check: cleantestlibs cleantmptestlogs tidy all check-stage2 check: cleantestlibs cleantmptestlogs tidy all check-stage2
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log $(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 \ check-lite: cleantestlibs cleantmptestlogs \
$(foreach crate,$(TARGET_CRATES),check-stage2-$(crate)) \ $(foreach crate,$(TARGET_CRATES),check-stage2-$(crate)) \
check-stage2-rpass \ check-stage2-rpass \