From d926b8342b492cfa442a72b4d4da01e7e23d9cba Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 29 Mar 2015 14:36:11 +0200
Subject: [PATCH] Update gonk's build.rs.

---
 ports/gonk/build.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ports/gonk/build.rs b/ports/gonk/build.rs
index 1e3d07fa18c..e2017fdeff0 100644
--- a/ports/gonk/build.rs
+++ b/ports/gonk/build.rs
@@ -2,18 +2,15 @@
  * 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/. */
 
-use std::old_io::process::{Command, ProcessExit, StdioContainer};
-use std::os;
-
+use std::env;
+use std::process::{Command, Stdio};
 
 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))
         .status()
         .unwrap();
-    assert_eq!(result, ProcessExit::ExitStatus(0));
+    assert!(result.success());
     println!("cargo:rustc-flags=-L native={}", out_dir);
 }