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/liballoc_jemalloc | |
| parent | d88736905e403ce3d0a68648fe1cd77dffad3641 (diff) | |
| parent | 7694ca419b3ade48e22982b69dec90eb45d8da73 (diff) | |
| download | rust-688a8583912a305f14ebc8bc21a2dd3cd3c912b0.tar.gz rust-688a8583912a305f14ebc8bc21a2dd3cd3c912b0.zip | |
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/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/liballoc_jemalloc/build.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/liballoc_jemalloc/Cargo.toml b/src/liballoc_jemalloc/Cargo.toml index 94700cf4475..4042c4d2d4e 100644 --- a/src/liballoc_jemalloc/Cargo.toml +++ b/src/liballoc_jemalloc/Cargo.toml @@ -19,7 +19,7 @@ libc = { path = "../rustc/libc_shim" } [build-dependencies] build_helper = { path = "../build_helper" } -gcc = "0.3.50" +cc = "1.0" [features] debug = [] diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs index d89d3bcdb62..7dd85ddcc79 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -11,7 +11,7 @@ #![deny(warnings)] extern crate build_helper; -extern crate gcc; +extern crate cc; use std::env; use std::path::PathBuf; @@ -63,7 +63,7 @@ fn main() { _ => return, }; - 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 cflags = compiler.args() @@ -150,7 +150,7 @@ fn main() { // sure the symbols are available. if target.contains("androideabi") { println!("cargo:rerun-if-changed=pthread_atfork_dummy.c"); - gcc::Build::new() + cc::Build::new() .flag("-fvisibility=hidden") .file("pthread_atfork_dummy.c") .compile("libpthread_atfork_dummy.a"); |
