Add AppleTVOS support

Author: youknowone

src/lib.rs

@@ -1529,7 +1529,10 @@ impl Build {
                     cmd.push_opt_unless_duplicate("-DANDROID".into());
                 }
 
-                if !target.contains("apple-ios") && !target.contains("apple-watchos") {
+                if !target.contains("apple-ios")
+                    && !target.contains("apple-watchos")
+                    && !target.contains("apple-tvos")
+                {
                     cmd.push_cc_arg("-ffunction-sections".into());
                     cmd.push_cc_arg("-fdata-sections".into());
                 }
@@ -1611,6 +1614,20 @@ impl Build {
                                 .into(),
                             );
                         }
+                    } else if target.contains("x86_64-apple-tvos") {
+                        if let Some(arch) =
+                            map_darwin_target_from_rust_to_compiler_architecture(target)
+                        {
+                            let deployment_target =
+                                env::var("TVOS_DEPLOYMENT_TARGET").unwrap_or_else(|_| "9.0".into());
+                            cmd.args.push(
+                                format!(
+                                    "--target={}-apple-tvos{}-simulator",
+                                    arch, deployment_target
+                                )
+                                .into(),
+                            );
+                        }
                     } else if target.starts_with("riscv64gc-") {
                         cmd.args.push(
                             format!("--target={}", target.replace("riscv64gc", "riscv64")).into(),
@@ -1870,8 +1887,11 @@ impl Build {
             }
         }
 
-        if target.contains("apple-ios") || target.contains("apple-watchos") {
-            self.ios_watchos_flags(cmd)?;
+        if target.contains("apple-ios")
+            || target.contains("apple-watchos")
+            || target.contains("apple-tvos")
+        {
+            self.apple_flags(cmd)?;
         }
 
         if self.static_flag.unwrap_or(false) {
@@ -2064,7 +2084,7 @@ impl Build {
         Ok(())
     }
 
-    fn ios_watchos_flags(&self, cmd: &mut Tool) -> Result<(), Error> {
+    fn apple_flags(&self, cmd: &mut Tool) -> Result<(), Error> {
         enum ArchSpec {
             Device(&'static str),
             Simulator(&'static str),
@@ -2074,19 +2094,23 @@ impl Build {
         enum Os {
             Ios,
             WatchOs,
+            TvOs,
         }
         impl Display for Os {
             fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
                 match self {
                     Os::Ios => f.write_str("iOS"),
                     Os::WatchOs => f.write_str("WatchOS"),
+                    Os::TvOs => f.write_str("tvOS"),
                 }
             }
         }
 
         let target = self.get_target()?;
         let os = if target.contains("-watchos") {
             Os::WatchOs
+        } else if target.contains("-tvos") {
+            Os::TvOs
         } else {
             Os::Ios
         };
@@ -2103,7 +2127,7 @@ impl Build {
             None => false,
         };
 
-        let is_sim = match target.split('-').nth(3) {
+        let is_arm_sim = match target.split('-').nth(3) {
             Some(v) => v == "sim",
             None => false,
         };
@@ -2120,14 +2144,14 @@ impl Build {
                     ));
                 }
             }
-        } else if is_sim {
+        } else if is_arm_sim {
             match arch {
                 "arm64" | "aarch64" => ArchSpec::Simulator("-arch arm64"),
                 "x86_64" => ArchSpec::Simulator("-m64"),
                 _ => {
                     return Err(Error::new(
                         ErrorKind::ArchitectureInvalid,
-                        "Unknown architecture for iOS simulator target.",
+                        "Unknown architecture for simulator target.",
                     ));
                 }
             }
@@ -2161,6 +2185,11 @@ impl Build {
                 "watch",
                 std::env::var("WATCHOS_DEPLOYMENT_TARGET").unwrap_or_else(|_| "2.0".into()),
             ),
+            Os::TvOs => (
+                "appletv",
+                "appletv",
+                std::env::var("TVOS_DEPLOYMENT_TARGET").unwrap_or_else(|_| "9.0".into()),
+            ),
         };
 
         let sdk = match arch {

tests/test.rs

@@ -427,3 +427,33 @@ fn msvc_no_dash_dash() {
 
     test.cmd(0).must_not_have("--");
 }
+
+#[cfg(target_os = "macos")]
+#[test]
+fn apple_tvos() {
+    for target in &["aarch64-apple-tvos"] {
+        let test = Test::gnu();
+        test.gcc()
+            .target(&target)
+            .host(&target)
+            .file("foo.c")
+            .compile("foo");
+
+        test.cmd(0).must_have("-mappletvos-version-min=9.0");
+    }
+}
+
+#[cfg(target_os = "macos")]
+#[test]
+fn apple_tvsimulator() {
+    for target in &["x86_64-apple-tvos"] {
+        let test = Test::gnu();
+        test.gcc()
+            .target(&target)
+            .host(&target)
+            .file("foo.c")
+            .compile("foo");
+
+        test.cmd(0).must_have("-mappletvsimulator-version-min=9.0");
+    }
+}