Replace -ios with apple-ios (#579)

byteallen · web-flow · commit 5bef1f295e90 · 2021-01-27T09:10:04.000-06:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -1414,7 +1414,7 @@ impl Build {
                     cmd.push_opt_unless_duplicate("-DANDROID".into());
                 }
 
-                if !target.contains("-ios") {
+                if !target.contains("apple-ios") {
                     cmd.push_cc_arg("-ffunction-sections".into());
                     cmd.push_cc_arg("-fdata-sections".into());
                 }
@@ -1693,9 +1693,7 @@ impl Build {
             }
         }
 
-        if target.contains("-ios") {
-            // FIXME: potential bug. iOS is always compiled with Clang, but Gcc compiler may be
-            // detected instead.
+        if target.contains("apple-ios") {
             self.ios_flags(cmd)?;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1414,7 +1414,7 @@ impl Build {`
`1414`	`1414`	`cmd.push_opt_unless_duplicate("-DANDROID".into());`
`1415`	`1415`	`}`
`1416`	`1416`
`1417`		`- if !target.contains("-ios") {`
	`1417`	`+ if !target.contains("apple-ios") {`
`1418`	`1418`	`cmd.push_cc_arg("-ffunction-sections".into());`
`1419`	`1419`	`cmd.push_cc_arg("-fdata-sections".into());`
`1420`	`1420`	`}`
`@@ -1693,9 +1693,7 @@ impl Build {`
`1693`	`1693`	`}`
`1694`	`1694`	`}`
`1695`	`1695`
`1696`		`- if target.contains("-ios") {`
`1697`		`- // FIXME: potential bug. iOS is always compiled with Clang, but Gcc compiler may be`
`1698`		`- // detected instead.`
	`1696`	`+ if target.contains("apple-ios") {`
`1699`	`1697`	`self.ios_flags(cmd)?;`
`1700`	`1698`	`}`
`1701`	`1699`