diff options
| author | bors <bors@rust-lang.org> | 2017-06-23 13:46:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-23 13:46:43 +0000 |
| commit | 229d0d3266002d343cdd2f4a3bf7f2fe9da15f38 (patch) | |
| tree | 013df87f8b1813e88368ac8c1728bc4c9b6bfb76 /src/bootstrap/native.rs | |
| parent | bd32b1ba0d2d51a7e8505c1d3e37d17d3ba12843 (diff) | |
| parent | 9037ef2c782c9890e84285e81a183109ef1293f0 (diff) | |
| download | rust-229d0d3266002d343cdd2f4a3bf7f2fe9da15f38.tar.gz rust-229d0d3266002d343cdd2f4a3bf7f2fe9da15f38.zip | |
Auto merge of #42856 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 8 pull requests - Successful merges: #42777, #42783, #42787, #42821, #42822, #42825, #42829, #42833 - Failed merges:
Diffstat (limited to 'src/bootstrap/native.rs')
| -rw-r--r-- | src/bootstrap/native.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index a23be37b15e..f150df6cdcd 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -155,7 +155,7 @@ pub fn llvm(build: &Build, target: &str) { } let cc = build.cc(target); - let cxx = build.cxx(target); + let cxx = build.cxx(target).unwrap(); // Handle msvc + ninja + ccache specially (this is what the bots use) if target.contains("msvc") && |