about summary refs log tree commit diff
path: root/src/tools/compiletest
diff options
context:
space:
mode:
authorJohannes Nixdorf <mixi@exherbo.org>2018-05-10 10:58:51 +0200
committerJohannes Nixdorf <mixi@exherbo.org>2018-05-31 12:01:50 +0200
commit665d6673d53ae83b9ce1a0cabb63c9cc2b720efe (patch)
tree41cfb92237b9b34063e1c84b78c9199036da668d /src/tools/compiletest
parent55dab7c82018101709de8cb986cede87effbb50d (diff)
downloadrust-665d6673d53ae83b9ce1a0cabb63c9cc2b720efe.tar.gz
rust-665d6673d53ae83b9ce1a0cabb63c9cc2b720efe.zip
compiletest: escape CXX the same way as CC for MSVC
Diffstat (limited to 'src/tools/compiletest')
-rw-r--r--src/tools/compiletest/src/runtest.rs2
1 files changed, 1 insertions, 1 deletions
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 @@ impl<'test> TestCx<'test> {
                 .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))