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/liballoc_jemalloc | |
| 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/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/build.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs index e43b9a9df1b..d1b3583d256 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -43,7 +43,8 @@ fn main() { } 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()) |