about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorPeter Atashian <retep998@gmail.com>2016-06-16 08:38:06 -0400
committerPeter Atashian <retep998@gmail.com>2016-06-16 08:38:06 -0400
commite0992df35f7827fe09b1a54558e396511bcba12a (patch)
tree983d88328de165c69c61ab0b79b9f7eeaa768b6b /src/libstd
parenta479a6a7a6fa1bfe1f18d7d7411ad14e7b8ca17b (diff)
downloadrust-e0992df35f7827fe09b1a54558e396511bcba12a.tar.gz
rust-e0992df35f7827fe09b1a54558e396511bcba12a.zip
Fix issue where rustbuild expected msvc to have ar
Signed-off-by: Peter Atashian <retep998@gmail.com>
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/build.rs3
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")