Explicitly check for iOS/tvOS.

aspen · aspen · commit 67b162f043e7 · 2020-07-01T13:19:09.000-04:00
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
@@ -176,7 +176,7 @@ impl Step for Llvm {
         }
 
         // Are we compiling for iOS/tvOS?
-        if target.contains("apple") && !target.contains("darwin") {
+        if target.contains("apple-ios") || target.contains("apple-tvos") {
             // These two defines prevent CMake from automatically trying to add a MacOSX sysroot, which leads to a compiler error.
             cfg.define("CMAKE_OSX_SYSROOT", "/");
             cfg.define("CMAKE_OSX_DEPLOYMENT_TARGET", "");

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ impl Step for Llvm {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`// Are we compiling for iOS/tvOS?`
`179`		`- if target.contains("apple") && !target.contains("darwin") {`
	`179`	`+ if target.contains("apple-ios") \|\| target.contains("apple-tvos") {`
`180`	`180`	`// These two defines prevent CMake from automatically trying to add a MacOSX sysroot, which leads to a compiler error.`
`181`	`181`	`cfg.define("CMAKE_OSX_SYSROOT", "/");`
`182`	`182`	`cfg.define("CMAKE_OSX_DEPLOYMENT_TARGET", "");`