mirror of
https://github.com/servo/servo.git
synced 2025-08-10 16:05:43 +01:00
Upgrade to rustc ba2f13ef0 2015-02-04
This commit is contained in:
parent
bc6882bdef
commit
d5dd1d658e
136 changed files with 1091 additions and 878 deletions
|
@ -1 +1 @@
|
|||
Subproject commit 70c2242c45216a731d5ccd5d028ebbd206e2c9a3
|
||||
Subproject commit f9da46ed02736508d75333008d54506eec87a33b
|
|
@ -1,6 +1,6 @@
|
|||
fn main() {
|
||||
::std::os::set_exit_status(1);
|
||||
let _ = ::std::io::stderr().write(br"
|
||||
let _ = ::std::old_io::stderr().write(br"
|
||||
|
||||
This is not the `Cargo.toml` file you're looking for.
|
||||
Invoke Cargo through mach instead, e.g. `./mach build`.
|
||||
|
|
|
@ -4,4 +4,4 @@ name = "task_info"
|
|||
version = "0.0.1"
|
||||
authors = ["The Servo Project Developers"]
|
||||
|
||||
build = "make -f makefile.cargo"
|
||||
build = "build.rs"
|
||||
|
|
20
support/rust-task_info/build.rs
Normal file
20
support/rust-task_info/build.rs
Normal file
|
@ -0,0 +1,20 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* 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;
|
||||
|
||||
fn main() {
|
||||
let out_dir = os::getenv("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));
|
||||
println!("cargo:rustc-flags=-L native={}", out_dir);
|
||||
}
|
|
@ -10,6 +10,8 @@
|
|||
#![crate_name = "task_info"]
|
||||
#![crate_type = "rlib"]
|
||||
|
||||
#![feature(libc)]
|
||||
|
||||
extern crate libc;
|
||||
|
||||
#[cfg(target_os="macos")]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue