diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-03-07 13:57:17 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-03-07 13:57:17 -0800 |
| commit | 16cc9ce8a27eac42950d8413f46c648e35e10cb3 (patch) | |
| tree | 99f6ed796a60eef5a806809bd02146d3463ddf0b | |
| parent | 7c050445a9067fac39d8cf3544f8df8e6704cca8 (diff) | |
| download | rust-16cc9ce8a27eac42950d8413f46c648e35e10cb3.tar.gz rust-16cc9ce8a27eac42950d8413f46c648e35e10cb3.zip | |
Fix an error in the appveyor config
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index fc1bb95b9b7..45e1b4b90d6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,7 +27,7 @@ environment: # MSVC aux tests - MSYS_BITS: 64 - RUST_CHECK_TARGET: check-aux AUX_ARGS="--exclude src/tools/cargotest --exclude src/tools/cargo" + RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1 RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc - MSYS_BITS: 64 SCRIPT: python x.py test src/tools/cargotest src/tools/cargo diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index 97ea792c780..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,8 +58,6 @@ 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 \ |