diff options
author | Paul Osborne <osbpau@gmail.com> | 2016-03-05 18:01:09 -0600 |
---|---|---|
committer | Paul Osborne <osbpau@gmail.com> | 2016-03-05 18:01:09 -0600 |
commit | b8f0535127bd1d2b2750a9ffd31d8da9710465a2 (patch) | |
tree | 74cabbec91be6f6f39951d171f9610a30b9b1bc0 | |
parent | 9f590fbaf1d80d18f42fd747029736e69e409694 (diff) | |
download | nix-b8f0535127bd1d2b2750a9ffd31d8da9710465a2.zip |
test: clean up the test build script
Signed-off-by: Paul Osborne <osbpau@gmail.com>
-rw-r--r-- | nix-test/build.rs | 47 |
1 files changed, 5 insertions, 42 deletions
diff --git a/nix-test/build.rs b/nix-test/build.rs index 6717b48c..0c18e1c8 100644 --- a/nix-test/build.rs +++ b/nix-test/build.rs @@ -13,46 +13,9 @@ pub fn main() { "UNKNOWN" }; - let mut config = gcc::Config::new(); - - for file in &["src/const.c", "src/sizes.c"] { - config.file(file); - } - - config.define(os, None); - - config.compile("libnixtest.a"); -} - -/* -use std::env; -use std::process::Command; - -pub fn main() { - let root = env::var("CARGO_MANIFEST_DIR").unwrap(); - let make = root.clone() + "/Makefile"; - let src = root.clone() + "/src"; - let out = env::var("OUT_DIR").unwrap(); - let target = env::var("TARGET").unwrap(); - - let os = if target.contains("linux") { - "LINUX" - } else if target.contains("darwin") { - "DARWIN" - } else { - "UNKNOWN" - }; - - let res = Command::new("make") - .arg("-f").arg(&make) - .current_dir(&out) - .env("VPATH", &src) - .env("OS", os) - .spawn().unwrap() - .wait().unwrap(); - - assert!(res.success()); - - println!("cargo:rustc-flags=-L {}/", out); + gcc::Config::new() + .file("src/const.c") + .file("src/sizes.c") + .define(os, None) + .compile("libnixtest.a"); } -*/ |