diff options
| author | bors <bors@rust-lang.org> | 2016-06-16 19:07:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-16 19:07:41 -0700 |
| commit | 114be1e9f0db2c84e38b5ed96d4e4450771e8a44 (patch) | |
| tree | cf17be35a47fd2c95f45392557ac094f2b206224 /src/libstd | |
| parent | f911d87b3b6ee3e484ca8dd7da4be85970d9230d (diff) | |
| parent | 019c594c6aebada1cdbb4b7c3d947d9dc17088e1 (diff) | |
| download | rust-114be1e9f0db2c84e38b5ed96d4e4450771e8a44.tar.gz rust-114be1e9f0db2c84e38b5ed96d4e4450771e8a44.zip | |
Auto merge of #34315 - Manishearth:rollup, r=Manishearth
Rollup of 4 pull requests - Successful merges: #34298, #34302, #34307, #34312 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/build.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/build.rs b/src/libstd/build.rs index ff9dacbb679..9c408366f8b 100644 --- a/src/libstd/build.rs +++ b/src/libstd/build.rs @@ -80,7 +80,8 @@ fn build_libbacktrace(host: &str, target: &str) { } let compiler = gcc::Config::new().get_compiler(); - let ar = build_helper::cc2ar(compiler.path(), target); + // only msvc returns None for ar so unwrap is okay + let ar = build_helper::cc2ar(compiler.path(), target).unwrap(); let cflags = compiler.args().iter().map(|s| s.to_str().unwrap()) .collect::<Vec<_>>().join(" "); run(Command::new("sh") |