Auto merge of #1152 - divergentdave:shim-directory, r=RalfJung

[rust.git] / .appveyor.yml

diff --git a/.appveyor.yml b/.appveyor.yml
index 2ba95c228bafb66ca24a583f7a4247b948fa1867..4281fe0180f05f9d46a2cb8ecd8be57bc86b3260 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -27,12 +27,13 @@ install:
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain stable --profile minimal
     - set PATH=%USERPROFILE%\.cargo\bin;%PATH%
     - rustup default stable
-    - rustup uninstall beta
-    - rustup component remove rust-docs & exit 0
+    - rustup toolchain uninstall beta
     - rustup update
     # Install "master" toolchain
-    - cargo install rustup-toolchain-install-master & exit 0
-    - rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c cargo -c rust-src
+    - cargo install rustup-toolchain-install-master
+    # We need to install cargo here as well or else the DLL search path inside `cargo run`
+    # will be for the wrong toolchain. (On Unix, `./miri` takes care of this, but not here.)
+    - rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c rust-src -c rustc-dev -c cargo
     - rustup default master
     - rustc --version
     - cargo --version