From 49d66067c397cc1cd5f85aa8e4d266aa6a3fa42d Mon Sep 17 00:00:00 2001
From: Diggory Blake <diggsey@googlemail.com>
Date: Fri, 21 Oct 2016 17:17:22 +0100
Subject: [PATCH] Treat an empty `CARGO_HOME` the same as an unset `CARGO_HOME`

---
 src/rustup-utils/src/utils.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rustup-utils/src/utils.rs b/src/rustup-utils/src/utils.rs
index c7f604e790..4b568befcc 100644
--- a/src/rustup-utils/src/utils.rs
+++ b/src/rustup-utils/src/utils.rs
@@ -479,7 +479,8 @@ pub fn cargo_home() -> Result<PathBuf> {
     let env_var = if let Some(v) = env_var {
        let vv = v.to_string_lossy().to_string();
        if vv.contains(".multirust/cargo") ||
-            vv.contains(r".multirust\cargo") {
+            vv.contains(r".multirust\cargo") ||
+            vv.trim().is_empty() {
            None
        } else {
            Some(v)