From: Johannes Nixdorf <mixi@exherbo.org>
Date: Thu, 10 May 2018 08:58:51 +0000 (+0200)
Subject: compiletest: escape CXX the same way as CC for MSVC
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=665d6673d53ae83b9ce1a0cabb63c9cc2b720efe;p=rust.git

compiletest: escape CXX the same way as CC for MSVC
---

diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 5daf192e2db..cc00f200171 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2529,7 +2529,7 @@ fn run_rmake_test(&self) {
                 .env("IS_WINDOWS", "1")
                 .env("MSVC_LIB", format!("'{}' -nologo", lib.display()))
                 .env("CC", format!("'{}' {}", self.config.cc, cflags))
-                .env("CXX", &self.config.cxx);
+                .env("CXX", format!("'{}'", &self.config.cxx));
         } else {
             cmd.env("CC", format!("{} {}", self.config.cc, self.config.cflags))
                 .env("CXX", format!("{} {}", self.config.cxx, self.config.cflags))