diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2016-06-17 00:12:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-17 00:12:04 +0100 |
| commit | 51b20bcbf4c8990d31b8acbc5071db7eaecac560 (patch) | |
| tree | 8baceb4a35adc4ded47c2b73cad8f4f945b19d48 /src/liballoc_jemalloc | |
| parent | 986bb53a7bfbcfdfd33996d8ef0f4fd983e7bdba (diff) | |
| parent | e0992df35f7827fe09b1a54558e396511bcba12a (diff) | |
| download | rust-51b20bcbf4c8990d31b8acbc5071db7eaecac560.tar.gz rust-51b20bcbf4c8990d31b8acbc5071db7eaecac560.zip | |
Rollup merge of #34302 - retep998:🐇-sanity-is-overrated-🐇, r=alexcrichton
Fix issue where rustbuild expected msvc to have ar I made `cc2ar` return an `Option`. r? @alexcrichton
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()) |