diff options
| author | bors <bors@rust-lang.org> | 2018-05-19 03:10:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-05-19 03:10:53 +0000 |
| commit | 8319ef5b78a10b3a8de4109bb8b0e6d23fbe4de1 (patch) | |
| tree | 131333a33ae4979adbb7e2109a53946985d844a9 /src/tools/compiletest | |
| parent | c6a1979e2046a8eb56900f3191ef69d11e7455e3 (diff) | |
| parent | acc874fbcda98bb5ec95399bea76b9f83227b758 (diff) | |
| download | rust-8319ef5b78a10b3a8de4109bb8b0e6d23fbe4de1.tar.gz rust-8319ef5b78a10b3a8de4109bb8b0e6d23fbe4de1.zip | |
Auto merge of #50709 - alexcrichton:revert-musl, r=sfackler
Revert #50105 until regression is fixed Discovered at https://github.com/rust-lang/rust/pull/50105#issuecomment-388630750 it looks like this caused a regression with i686 musl, so let's revert in the meantime while a fix is worked out
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 49d3dec0a58..140c90aaeac 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -2502,7 +2502,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", format!("'{}'", &self.config.cxx)); + .env("CXX", &self.config.cxx); } else { cmd.env("CC", format!("{} {}", self.config.cc, self.config.cflags)) .env("CXX", format!("{} {}", self.config.cxx, self.config.cflags)) |