From: soc <simon@ochsenreither.de>
Date: Fri, 14 Jun 2019 21:17:27 +0000 (+0200)
Subject: Fix project dirs path
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=a561f949ad214080054295035e5453c23c5a6ca5;p=rust.git

Fix project dirs path

    ProjectDirs::from("miri", "miri", "miri")

would get you `miri\miri` on Windows and `miri.miri.miri` on macOS.

I'm assuming here that your intention was to have only a `miri` directory on every OS.
---

diff --git a/.appveyor.yml b/.appveyor.yml
index d13ce2b3974..fe450922e04 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -36,7 +36,7 @@ build_script:
     - cargo install --all-features --force --path . --locked --offline
     # Get ourselves a MIR-full libstd, and use it henceforth
     - cargo miri setup
-    - set MIRI_SYSROOT=%USERPROFILE%\AppData\Local\miri\miri\cache\HOST
+    - set MIRI_SYSROOT=%USERPROFILE%\AppData\Local\miri\cache\HOST
 
 test_script:
     # Test miri
diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
index 3b7af932419..0b2662fe3fb 100644
--- a/src/bin/cargo-miri.rs
+++ b/src/bin/cargo-miri.rs
@@ -248,7 +248,7 @@ fn setup(ask_user: bool) {
     }
 
     // Next, we need our own libstd. We will do this work in whatever is a good cache dir for this platform.
-    let dirs = directories::ProjectDirs::from("miri", "miri", "miri").unwrap();
+    let dirs = directories::ProjectDirs::from("", "", "miri").unwrap();
     let dir = dirs.cache_dir();
     if !dir.exists() {
         fs::create_dir_all(&dir).unwrap();