diff options
| author | bors <bors@rust-lang.org> | 2018-03-07 21:59:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-07 21:59:15 +0000 |
| commit | 5430c0c5c0fbdfb8e89358a187d2f9a8d4b796d4 (patch) | |
| tree | 99f6ed796a60eef5a806809bd02146d3463ddf0b /src/bootstrap/mk | |
| parent | 4cdbac639af2074b8a07b4391b4e3e28b4118487 (diff) | |
| parent | 16cc9ce8a27eac42950d8413f46c648e35e10cb3 (diff) | |
| download | rust-5430c0c5c0fbdfb8e89358a187d2f9a8d4b796d4.tar.gz rust-5430c0c5c0fbdfb8e89358a187d2f9a8d4b796d4.zip | |
Auto merge of #48806 - alexcrichton:rollup, r=alexcrichton
Rollup of 9 pull requests - Successful merges: #48511, #48549, #48618, #48624, #48651, #48698, #48778, #48787, #48802 - Failed merges: #48669, #48710
Diffstat (limited to 'src/bootstrap/mk')
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index 925a361f0b2..c62fa0ede70 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -16,6 +16,12 @@ Q := @ BOOTSTRAP_ARGS := endif +ifdef EXCLUDE_CARGO +AUX_ARGS := src/tools/cargo src/tools/cargotest +else +AUX_ARGS := +endif + BOOTSTRAP := $(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap.py all: @@ -52,14 +58,13 @@ check: $(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS) check-aux: $(Q)$(BOOTSTRAP) test \ - src/tools/cargo \ - src/tools/cargotest \ src/test/pretty \ src/test/run-pass/pretty \ src/test/run-fail/pretty \ src/test/run-pass-valgrind/pretty \ src/test/run-pass-fulldeps/pretty \ src/test/run-fail-fulldeps/pretty \ + $(AUX_ARGS) \ $(BOOTSTRAP_ARGS) check-bootstrap: $(Q)$(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap_test.py |