Merge pull request #307 from mixi/master

Pass -static depending on crt-static on linux too.
rust-lang · Apr 2, 2018 · a2c478f · a2c478f
2 parents 7fef736 + 3bdeefd
commit a2c478f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1106,8 +1106,11 @@ impl Build {
                     cmd.args.push("-m64".into());
                 }
 
-                if self.static_flag.is_none() && target.contains("musl") {
-                    cmd.args.push("-static".into());
+                if self.static_flag.is_none() {
+                    let features = env::var("CARGO_CFG_TARGET_FEATURE").unwrap_or(String::new());
+                    if features.contains("crt-static") {
+                        cmd.args.push("-static".into());
+                    }
                 }
 
                 // armv7 targets get to use armv7 instructions