servo: Merge #6220 - Switch task_info to use modern Cargo tools (from metajack:task-info-build-cleanup); r=nox

This is the first bit of build cleanup on my quest to make Cargo faster.

Source-Repo: https://github.com/servo/servo
Source-Revision: e6c4ca4960cc9f6ac9bd17c35a10b78350b70c73

UltraBlame original commit: 2334f5500d2f4d6245ad641c1da4f0c48bf0ef02

Author: marco-c

servo/components/profile/Cargo.toml

@@ -10,13 +10,16 @@ path = "lib.rs"
 [dependencies.profile_traits]
 path = "../profile_traits"
 
-[dependencies.task_info]
-path = "../../support/rust-task_info"
-
 [dependencies.util]
 path = "../util"
 
 [dependencies]
 libc = "*"
 regex = "0.1.14"
 time = "0.1.12"
+
+[target.x86_64-apple-darwin.dependencies.task_info]
+path = "../../support/rust-task_info"
+
+[target.i686-apple-darwin.dependencies.task_info]
+path = "../../support/rust-task_info"

servo/components/servo/Cargo.lock

@@ -5,3 +5,6 @@ version = "0.0.1"
 authors = ["The Servo Project Developers"]
 
 build = "build.rs"
+
+[build-dependencies]
+gcc = "0.3.4"

servo/ports/cef/Cargo.lock

@@ -2,14 +2,10 @@
 
 
 
-use std::process::Command;
-use std::env;
+extern crate gcc;
 
 fn main() {
-    assert!(Command::new("make")
-        .args(&["-f", "makefile.cargo"])
-        .status()
-        .unwrap()
-        .success());
-    println!("cargo:rustc-flags=-L native={}", env::var("OUT_DIR").unwrap());
+    let mut cfg = gcc::Config::new();
+    cfg.file("src/task_info.c");
+    cfg.compile("libtask_info.a");
 }

servo/ports/gonk/Cargo.lock

@@ -14,6 +14,5 @@
 
 extern crate libc;
 
-#[cfg(target_os="macos")]
 pub mod task_basic_info;