Merge pull request #307 from mixi/master

alexcrichton · web-flow · commit a2c478febaba · 2018-04-02T18:32:55.000+02:00
Pass -static depending on crt-static on linux too.
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

Original file line number	Diff line number	Diff line change
`@@ -1106,8 +1106,11 @@ impl Build {`
`1106`	`1106`	`cmd.args.push("-m64".into());`
`1107`	`1107`	`}`
`1108`	`1108`
`1109`		`- if self.static_flag.is_none() && target.contains("musl") {`
`1110`		`- cmd.args.push("-static".into());`
	`1109`	`+ if self.static_flag.is_none() {`
	`1110`	`+ let features = env::var("CARGO_CFG_TARGET_FEATURE").unwrap_or(String::new());`
	`1111`	`+ if features.contains("crt-static") {`
	`1112`	`+ cmd.args.push("-static".into());`
	`1113`	`+ }`
`1111`	`1114`	`}`
`1112`	`1115`
`1113`	`1116`	`// armv7 targets get to use armv7 instructions`