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

bump rustc-cfg version and show a better error message when it fails

This commit is contained in:
Jorge Aparicio 2016-10-03 09:12:13 -05:00
parent 954e3b7095
commit 77bca82434
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -6,7 +6,7 @@ version = "0.1.0"
[build-dependencies] [build-dependencies]
gcc = "0.3.35" gcc = "0.3.35"
rustc-cfg = "0.1.2" rustc-cfg = "0.2.0"
[dependencies] [dependencies]

8
build.rs
View File

@ -2,8 +2,9 @@ extern crate gcc;
extern crate rustc_cfg; extern crate rustc_cfg;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::env; use std::io::Write;
use std::path::Path; use std::path::Path;
use std::{env, io, process};
use rustc_cfg::Cfg; use rustc_cfg::Cfg;
@ -50,7 +51,10 @@ fn main() {
let target = env::var("TARGET").unwrap(); let target = env::var("TARGET").unwrap();
let Cfg { ref target_arch, ref target_os, ref target_env, ref target_vendor, .. } = let Cfg { ref target_arch, ref target_os, ref target_env, ref target_vendor, .. } =
Cfg::new(&target).unwrap(); Cfg::new(&target).unwrap_or_else(|e| {
writeln!(io::stderr(), "{}", e).ok();
process::exit(1)
});
// NOTE we are going to assume that llvm-target, what determines our codegen option, matches the // NOTE we are going to assume that llvm-target, what determines our codegen option, matches the
// target triple. This is usually correct for our built-in targets but can break in presence of // target triple. This is usually correct for our built-in targets but can break in presence of
// custom targets, which can have arbitrary names. // custom targets, which can have arbitrary names.