diff options
| author | bors <bors@rust-lang.org> | 2017-09-28 16:19:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-09-28 16:19:58 +0000 |
| commit | 688a8583912a305f14ebc8bc21a2dd3cd3c912b0 (patch) | |
| tree | d13bdfeb72559ca820a61ff27753654b51fdf190 /src/libstd | |
| parent | d88736905e403ce3d0a68648fe1cd77dffad3641 (diff) | |
| parent | 7694ca419b3ade48e22982b69dec90eb45d8da73 (diff) | |
Auto merge of #44785 - alexcrichton:update-cargo, r=nikomatsakis
Update some minor dependencies * run `cargo update` * Update cargo submodule * Update to the `cc` crate from `gcc`
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/libstd/build.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 09c16816934..fb276448ffa 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -36,7 +36,7 @@ rustc_tsan = { path = "../librustc_tsan" } [build-dependencies] build_helper = { path = "../build_helper" } -gcc = "0.3.50" +cc = "1.0" [features] backtrace = [] diff --git a/src/libstd/build.rs b/src/libstd/build.rs index b8061665aa1..7ca762c801a 100644 --- a/src/libstd/build.rs +++ b/src/libstd/build.rs @@ -11,7 +11,7 @@ #![deny(warnings)] extern crate build_helper; -extern crate gcc; +extern crate cc; use std::env; use std::process::Command; @@ -77,7 +77,7 @@ fn main() { fn build_libbacktrace(host: &str, target: &str) -> Result<(), ()> { let native = native_lib_boilerplate("libbacktrace", "libbacktrace", "backtrace", ".libs")?; - let compiler = gcc::Build::new().get_compiler(); + let compiler = cc::Build::new().get_compiler(); // only msvc returns None for ar so unwrap is okay let ar = build_helper::cc2ar(compiler.path(), target).unwrap(); let mut cflags = compiler.args().iter().map(|s| s.to_str().unwrap()) |