Fix an error in the appveyor config

rust-lang · Mar 7, 2018 · 16cc9ce · 16cc9ce
1 parent 7c05044
commit 16cc9ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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 \