From b6fb8661df951f81538097a7281372fbf0c30eae Mon Sep 17 00:00:00 2001 From: Alexis Beingessner Date: Sat, 23 May 2015 21:11:07 -0700 Subject: [PATCH 1/2] `-` -> `_` --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 0f1cb68..4fc5589 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,6 +8,6 @@ build = "build.rs" [lib] -name = "mp4v2-sys" +name = "mp4v2_sys" path = "lib.rs" From 5bcacb721d7f9e605f4cecbaef6a3f47d7ceffdb Mon Sep 17 00:00:00 2001 From: Alexis Beingessner Date: Sat, 23 May 2015 21:30:27 -0700 Subject: [PATCH 2/2] update to new_io --- build.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/build.rs b/build.rs index d063cbd..9f7ae68 100644 --- a/build.rs +++ b/build.rs @@ -2,20 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#![feature(io)] - -use std::old_io::process::{Command, ProcessExit, StdioContainer}; -use std::os; +use std::process::{Command, Stdio}; +use std::env; fn main() { - let out_dir = os::getenv("OUT_DIR").unwrap(); + let out_dir = env::var("OUT_DIR").unwrap(); let result = Command::new("make") .args(&["-f", "makefile.cargo"]) - .stdout(StdioContainer::InheritFd(1)) - .stderr(StdioContainer::InheritFd(2)) + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) .status() .unwrap(); - assert_eq!(result, ProcessExit::ExitStatus(0)); + assert!(result.success()); println!("cargo:rustc-flags=-L native={}", out_dir); }