Add apple silicon target for smithy cli

smithy-lang · Dec 9, 2021 · 78a3ac9 · 78a3ac9
1 parent 982654e
commit 78a3ac9
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/smithy-cli/build.gradle b/smithy-cli/build.gradle
@@ -34,7 +34,14 @@ ext {
 if (Os.isFamily(Os.FAMILY_WINDOWS)) {
     ext.set("imageOs", "win64")
 } else if (Os.isFamily(Os.FAMILY_MAC)) {
-    ext.set("imageOs", "osx-x86_64")
+    if (Os.isArch("aarch64")) {
+        ext.set("imageOs", "osx-aarch_64")
+    } else if (Os.isArch("x86_64")) {
+        ext.set("imageOs", "osx-x86_64")
+    } else {
+        println("No JDK for ${System.getProperty("os.arch")}")
+        ext.set("imageOs", "")
+    }
 } else if (Os.isFamily(Os.FAMILY_UNIX)) {
     if (Os.isArch("aarch")) {
         ext.set("imageOs", "linux-aarch_64")
@@ -84,6 +91,10 @@ runtime {
         jdkHome = jdkDownload("${correttoRoot}-x64-macos-jdk.tar.gz")
     }
 
+    targetPlatform("osx-aarch_64") {
+        jdkHome = jdkDownload("${correttoRoot}-aarch64-macos-jdk.tar.gz")
+    }
+
     targetPlatform("win64") {
         jdkHome = jdkDownload("${correttoRoot}-x64-windows-jdk.zip")
     }