diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-02-14 00:10:06 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-02-14 17:45:54 -0800 |
| commit | ab17f445fe999bf7edf22d09b16ac7b7fd1155be (patch) | |
| tree | c1c9e82c2719b17f8c30e85936ca4e3e06dde11a | |
| parent | 2852fea61e51752a0a7f6c2aeb8fe798a2890c4e (diff) | |
| download | rust-ab17f445fe999bf7edf22d09b16ac7b7fd1155be.tar.gz rust-ab17f445fe999bf7edf22d09b16ac7b7fd1155be.zip | |
mk: Add NO_MKFILE_DEPS for turning off rebuild from makefile changes
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | mk/main.mk | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 599984623e2..1d828f6ee4c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,6 +37,7 @@ # (may require `CFG_ENABLE_VALGRIND`) # * `NO_REBUILD=1` - Don't rebootstrap when testing std # (and possibly other crates) +# * `NO_MKFILE_DEPS=1` - Don rebuild for modified .mk files # * `SAVE_TEMPS=1` - Use `--save-temps` flag on all `rustc` invocations # * `ASM_COMMENTS=1` - Use `-Z asm-comments` # * `TIME_PASSES=1` - Use `-Z time-passes` diff --git a/mk/main.mk b/mk/main.mk index 064b9cc3511..723f659b7fd 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -12,7 +12,11 @@ # and include all of the .d files in one fell swoop. ALL_OBJ_FILES := +ifneq ($(NO_MAKEFILE_DEPS),) +MKFILE_DEPS := +else MKFILE_DEPS := config.stamp $(call rwildcard,$(CFG_SRC_DIR)mk/,*) +endif NON_BUILD_HOST = $(filter-out $(CFG_BUILD),$(CFG_HOST)) NON_BUILD_TARGET = $(filter-out $(CFG_BUILD),$(CFG_TARGET)) |