M-Labs
/
compiler-builtins-zynq
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #196 from alexcrichton/cc 

Update to the `cc` dependency
This commit is contained in:
Alex Crichton 2017-09-27 17:38:06 -05:00 committed by GitHub
parent 67e0908d7f 006f173f85
commit 789e8c159f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@ -8,12 +8,12 @@ version = "0.1.0"
cast = { version = "0.2.2", features = ["x128"], optional = true } cast = { version = "0.2.2", features = ["x128"], optional = true }
rand = { version = "0.3.15", optional = true } rand = { version = "0.3.15", optional = true }
[build-dependencies.gcc] [build-dependencies.cc]
optional = true optional = true
version = "0.3.53" version = "1.0"
[features] [features]
c = ["gcc"] c = ["cc"]
compiler-builtins = [] compiler-builtins = []
default = ["compiler-builtins"] default = ["compiler-builtins"]
mem = [] mem = []

4
build.rs
View File

@ -3957,7 +3957,7 @@ macro_rules! panic {
#[cfg(feature = "c")] #[cfg(feature = "c")]
mod c { mod c {
extern crate gcc; extern crate cc;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::env; use std::env;
@ -4008,7 +4008,7 @@ mod c {
let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap(); let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap();
let target_vendor = env::var("CARGO_CFG_TARGET_VENDOR").unwrap(); let target_vendor = env::var("CARGO_CFG_TARGET_VENDOR").unwrap();
let cfg = &mut gcc::Build::new(); let cfg = &mut cc::Build::new();
cfg.warnings(false); cfg.warnings(false);

1
tests/floattidf.rs
View File

@ -4,5 +4,6 @@
not(any(target_env = "gnu", target_env = "musl")), not(any(target_env = "gnu", target_env = "musl")),
target_os = "linux", target_os = "linux",
test), no_std)] test), no_std)]
#![cfg(not(target_arch = "mips"))] // FIXME(#168)
include!(concat!(env!("OUT_DIR"), "/floattidf.rs")); include!(concat!(env!("OUT_DIR"), "/floattidf.rs"));