summaryrefslogtreecommitdiff
path: root/libssh2-sys/build.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-12 11:04:49 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-12 11:04:56 -0800
commit8baa8ccb39cd1a43362d2a1ee87d8c3b91496cd7 (patch)
tree9f76cc4846b436742b6930c7aaf90e34a873eb54 /libssh2-sys/build.rs
parentbe8fd87e921f0bd7dbd0ef32b38cd9d0ae861058 (diff)
downloadssh2-rs-8baa8ccb39cd1a43362d2a1ee87d8c3b91496cd7.zip
Update to rust master
Diffstat (limited to 'libssh2-sys/build.rs')
-rw-r--r--libssh2-sys/build.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/libssh2-sys/build.rs b/libssh2-sys/build.rs
index 461b8f1..1da101c 100644
--- a/libssh2-sys/build.rs
+++ b/libssh2-sys/build.rs
@@ -13,8 +13,8 @@ fn main() {
Err(..) => {}
}
- let mut cflags = env::var_string("CFLAGS").unwrap_or(String::new());
- let target = env::var_string("TARGET").unwrap();
+ let mut cflags = env::var("CFLAGS").unwrap_or(String::new());
+ let target = env::var("TARGET").unwrap();
let windows = target.contains("windows") || target.contains("mingw");
cflags.push_str(" -ffunction-sections -fdata-sections");
@@ -27,7 +27,7 @@ fn main() {
cflags.push_str(" -fPIC");
}
- match env::var_string("DEP_OPENSSL_ROOT") {
+ match env::var("DEP_OPENSSL_ROOT") {
Ok(s) => {
cflags.push_str(format!(" -I{}/include", s).as_slice());
cflags.push_str(format!(" -L{}/lib", s).as_slice());
@@ -35,8 +35,8 @@ fn main() {
Err(..) => {}
}
- let src = Path::new(env::var_string("CARGO_MANIFEST_DIR").unwrap());
- let dst = Path::new(env::var_string("OUT_DIR").unwrap());
+ let src = Path::new(env::var("CARGO_MANIFEST_DIR").unwrap());
+ let dst = Path::new(env::var("OUT_DIR").unwrap());
let mut config_opts = Vec::new();
if windows {
@@ -70,7 +70,7 @@ fn main() {
.replace("C:\\", "/c/")
.replace("\\", "/")));
run(Command::new(make())
- .arg(format!("-j{}", env::var_string("NUM_JOBS").unwrap()))
+ .arg(format!("-j{}", env::var("NUM_JOBS").unwrap()))
.cwd(&dst.join("build/src")));
// Don't run `make install` because apparently it's a little buggy on mingw