about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-03-08 01:06:41 +0000
committerbors <bors@rust-lang.org>2018-03-08 01:06:41 +0000
commitcdcca786468a71375584bb48e3093790c91084f7 (patch)
treea53543f6a6f026d7603f6395ad34469228cd793a
parent5430c0c5c0fbdfb8e89358a187d2f9a8d4b796d4 (diff)
parent893e499e8636c8e9ee3eea6e9f3337db9115018e (diff)
downloadrust-cdcca786468a71375584bb48e3093790c91084f7.tar.gz
rust-cdcca786468a71375584bb48e3093790c91084f7.zip
Auto merge of #48832 - alexcrichton:fix-skip-cargo, r=alexcrichton
appveyor: Fix a switched condition for cargotest

It was intended that EXCLUDE_CARGO *doesn't* run cargotest!
-rw-r--r--src/bootstrap/mk/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index c62fa0ede70..7897af4f724 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -17,9 +17,9 @@ BOOTSTRAP_ARGS :=
 endif
 
 ifdef EXCLUDE_CARGO
-AUX_ARGS := src/tools/cargo src/tools/cargotest
-else
 AUX_ARGS :=
+else
+AUX_ARGS := src/tools/cargo src/tools/cargotest
 endif
 
 BOOTSTRAP := $(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap.py