add macos catalyst support (#556)

Author: sercand

src/lib.rs

@@ -1459,6 +1459,14 @@ impl Build {
                             cmd.args
                                 .push(format!("--target={}-apple-darwin", arch).into());
                         }
+                    } else if target.contains("macabi") {
+                        if let Some(arch) =
+                            map_darwin_target_from_rust_to_compiler_architecture(target)
+                        {
+                            let ios = if arch == "arm64" { "ios" } else { "ios13.0" };
+                            cmd.args
+                                .push(format!("--target={}-apple-{}-macabi", arch, ios).into());
+                        }
                     } else {
                         cmd.args.push(format!("--target={}", target).into());
                     }
@@ -1881,6 +1889,7 @@ impl Build {
         enum ArchSpec {
             Device(&'static str),
             Simulator(&'static str),
+            Catalyst(&'static str),
         }
 
         let target = self.get_target()?;
@@ -1890,18 +1899,38 @@ impl Build {
                 "Unknown architecture for iOS target.",
             )
         })?;
-        let arch = match arch {
-            "arm" | "armv7" | "thumbv7" => ArchSpec::Device("armv7"),
-            "armv7s" | "thumbv7s" => ArchSpec::Device("armv7s"),
-            "arm64e" => ArchSpec::Device("arm64e"),
-            "arm64" | "aarch64" => ArchSpec::Device("arm64"),
-            "i386" | "i686" => ArchSpec::Simulator("-m32"),
-            "x86_64" => ArchSpec::Simulator("-m64"),
-            _ => {
-                return Err(Error::new(
-                    ErrorKind::ArchitectureInvalid,
-                    "Unknown architecture for iOS target.",
-                ));
+
+        let is_catalyst = match target.split('-').nth(3) {
+            Some(v) => v == "macabi",
+            None => false,
+        };
+
+        let arch = if is_catalyst {
+            match arch {
+                "arm64e" => ArchSpec::Catalyst("arm64e"),
+                "arm64" | "aarch64" => ArchSpec::Catalyst("arm64"),
+                "x86_64" => ArchSpec::Catalyst("-m64"),
+                _ => {
+                    return Err(Error::new(
+                        ErrorKind::ArchitectureInvalid,
+                        "Unknown architecture for iOS target.",
+                    ));
+                }
+            }
+        } else {
+            match arch {
+                "arm" | "armv7" | "thumbv7" => ArchSpec::Device("armv7"),
+                "armv7s" | "thumbv7s" => ArchSpec::Device("armv7s"),
+                "arm64e" => ArchSpec::Device("arm64e"),
+                "arm64" | "aarch64" => ArchSpec::Device("arm64"),
+                "i386" | "i686" => ArchSpec::Simulator("-m32"),
+                "x86_64" => ArchSpec::Simulator("-m64"),
+                _ => {
+                    return Err(Error::new(
+                        ErrorKind::ArchitectureInvalid,
+                        "Unknown architecture for iOS target.",
+                    ));
+                }
             }
         };
 
@@ -1922,6 +1951,7 @@ impl Build {
                     .push(format!("-mios-simulator-version-min={}", min_version).into());
                 "iphonesimulator"
             }
+            ArchSpec::Catalyst(_) => "macosx",
         };
 
         self.print(&format!("Detecting iOS SDK path for {}", sdk));