From 4ffbb5dd63ebc584291143ccc8e9d849e9c485d1 Mon Sep 17 00:00:00 2001
From: Aravind Gollakota <aravindprasant@gmail.com>
Date: Sat, 23 Jul 2016 11:53:07 -0700
Subject: [PATCH] rustbuild: Ensure PATH does not contain invalid character `"`

---
 src/bootstrap/sanity.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
index 7c0f09c322f..73749246758 100644
--- a/src/bootstrap/sanity.rs
+++ b/src/bootstrap/sanity.rs
@@ -31,6 +31,15 @@ use Build;
 pub fn check(build: &mut Build) {
     let mut checked = HashSet::new();
     let path = env::var_os("PATH").unwrap_or(OsString::new());
+    // On Windows, quotes are invalid characters for filename paths, and if
+    // one is present as part of the PATH then that can lead to the system
+    // being unable to identify the files properly. See
+    // https://github.com/rust-lang/rust/issues/34959 for more details.
+    if cfg!(windows) {
+        if path.to_string_lossy().contains("\"") {
+            panic!("PATH contains invalid character '\"'");
+        }
+    }
     let mut need_cmd = |cmd: &OsStr| {
         if !checked.insert(cmd.to_owned()) {
             return