Add arm64 slice for Catalyst builds. (#7044)

ryanwilson · web-flow · commit 1471651c870a · 2020-11-30T10:43:59.000-05:00
Note: this requires Xcode 12.2 to build. Thankfully, if run an older
system it will just ignore the arm64 flag and build it normally.
diff --git a/ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift b/ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift
@@ -32,9 +32,8 @@ enum TargetPlatform: CaseIterable {
     case .iOSDevice: return [.armv7, .arm64]
     // Include arm64 slices in the simulator for Apple silicon Macs.
     case .iOSSimulator: return [.i386, .x86_64, .arm64]
-    // TODO: Evaluate arm64 slice for Catalyst Apple silicon Macs, and x86_64h. Previous builds were
-    // limited to x86_64.
-    case .catalyst: return [.x86_64]
+    // TODO: Evaluate x86_64h slice. Previous builds were limited to x86_64.
+    case .catalyst: return [.x86_64, .arm64]
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,8 @@ enum TargetPlatform: CaseIterable {`
`32`	`32`	`case .iOSDevice: return [.armv7, .arm64]`
`33`	`33`	`// Include arm64 slices in the simulator for Apple silicon Macs.`
`34`	`34`	`case .iOSSimulator: return [.i386, .x86_64, .arm64]`
`35`		`- // TODO: Evaluate arm64 slice for Catalyst Apple silicon Macs, and x86_64h. Previous builds were`
`36`		`- // limited to x86_64.`
`37`		`- case .catalyst: return [.x86_64]`
	`35`	`+ // TODO: Evaluate x86_64h slice. Previous builds were limited to x86_64.`
	`36`	`+ case .catalyst: return [.x86_64, .arm64]`
`38`	`37`	`}`
`39`	`38`	`}`
`40`	`39`